Merge branch 'upstream' into debian

Merge branch 'upstream' into debian

Merge in version 0.7.1

Conflicts:
	ABOUT-NLS
	build-aux/compile
	build-aux/config.guess
	build-aux/config.rpath
	build-aux/config.sub
	build-aux/depcomp
	build-aux/install-sh
	build-aux/ltmain.sh
	build-aux/missing
	config.h.in
	m4/gettext.m4
	m4/iconv.m4
	m4/intlmacosx.m4
	m4/lib-ld.m4
	m4/lib-link.m4
	m4/lib-prefix.m4
	m4/libtool.m4
	m4/nls.m4
	m4/po.m4
	m4/progtest.m4
	po/Makefile.in.in
	po/Rules-quot
	po/moonshot-ui.pot