Merge branch 'update-1' of git+ssh://dev.laptop.org/git/sugar into update-1

Conflicts:

	NEWS
	configure.ac
	po/ja.po
	po/ml.po
	po/pa.po
	po/sugar.pot
