Merge branch 'master' of gitorious.org:xen-tools/xen-tools

Conflicts:
	debian/changelog

diff --cc debian/changelog
index da998d3272a7d7294b257013907d29cb722d6250,f85df2383086c0639fc0a2388645beebc8d1dbd5..5aad773b2dce1dbb22d1f7f4b9832cf9bf032193
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -38,9 -38,7 +38,10 @@@ xen-tools (4.4~dev-1) UNRELEASED; urgen
      - Fix filesystem tools installation in 91-install-fs-tools (which was
        broken since 4.3~rc1-1) by merging 91-install-fs-tools back into
        90-make-fstab. Also supports RPM-based distributions now.
 +    - Fix export of environment variables. Previously they could contain
 +      dashes and then were only accessible from within Perl, but not from
 +      within Bash.
+     - Uses Test::NoTabs; add according build-dependency.
    * Add debian/gbp.conf to be able to to build xen-tools with
      git-buildpackage.
    * Clean up debian/rules: