Null-Merge commit '839f1aa' into cg_merges_20121226

Conflicts:
	debian/changelog
	debian/compat
	debian/control
	debian/copyright
	debian/patches/series
	debian/rules
	debian/source/format