Marco Pesenti Gritti 9b68754ba5 Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar ... Conflicts: NEWS		2007-09-24 21:08:26 +02:00
..
__init__.py
activitiesdonut.py
FriendsBox.py
FriendView.py
HomeBox.py
HomeWindow.py
Makefile.am
MeshBox.py
MyIcon.py
proc_smaps.py
snowflakelayout.py
transitionbox.py