Merge branch 'sucrose-0.82' of gitorious@git.sugarlabs.org:log/mainline into sucrose-0.82

Conflicts:

	po/fr.po
