Marco Pesenti Gritti d577566151 Merge branch 'master' of git+ssh://marco@dev.laptop.org/git/sugar ... Conflicts: NEWS		2007-11-09 17:38:09 +01:00
..
sugar	Merge branch 'master' of git+ssh://marco@dev.laptop.org/git/sugar	2007-11-09 17:38:09 +01:00
.gitignore
Makefile.am