Merge branch 'master' of git@gitorious.org:up2date/up2date-n900-debian

Conflicts:
	debian/changelog
	debian/control
	debian/copyright
	debian/rules
