Simon McVittie b0c7a0546d Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar ... Conflicts: NEWS		2007-10-31 11:58:44 +00:00
..
sugar	Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar	2007-10-31 11:58:44 +00:00
.gitignore
Makefile.am