Dan Williams b703d93534 Merge branch 'master' of git+ssh://dcbw@crank.laptop.org/git/sugar ... Conflicts: sugar/browser/BrowserActivity.py		2006-06-18 01:33:05 -04:00
..
__init__.py
Buddy.py
Makefile.am
PresenceService.py
Service.py	Add serialize/deserialize functions for Service objects	2006-06-18 01:31:18 -04:00