Mike's Primary Account 81d9bed0d8 Merge branch 'master' of git+ssh://mcfletch@dev.laptop.org/git/sugar ... Conflicts: services/presence/buddy.py		2007-04-20 16:42:47 -04:00
..
clipboard
console
datastore
presence	Merge branch 'master' of git+ssh://mcfletch@dev.laptop.org/git/sugar	2007-04-20 16:42:47 -04:00
Makefile.am