Merge branch 'lib-vs-share'

diff --cc TODO.markdown
Simple merge

diff --cc bin/xen-create-image
index 1c94e8f17fe89b8032e1d2c694b418141f94a676,978f5edc0731446f609131bf13627d417263d031..29082e8e297906e85179e10511c5c4d08be69b40
--- 1/bin/xen-create-image
--- 2/bin/xen-create-image
+++ b/bin/xen-create-image
@@@ -1437,13 -1422,13 +1437,13 @@@ sub checkOptio
      # Define argument types
      my %types = (
          integerWithSuffix => {
 -            check   => qr/^[0-9.]+[GgMmKk]b?$/,
 -            message => "takes a suffixed integer.\n",
 +            check   => qr/^[0-9.]+[GMk]B?$/i,
 +            message => "takes a suffixed (mb, MB, G, k, etc.) integer.\n",
          },
          distribution => {
-             check   => sub { -d "/usr/lib/xen-tools/$_[0].d" },
+             check   => sub { -d "/usr/share/xen-tools/$_[0].d" },
              message => "takes a distribution name " .
-                        "(see /usr/lib/xen-tools for valid values).\n",
+                        "(see /usr/share/xen-tools for valid values).\n",
          },
          imageType => {
              check   => qr/^sparse|full$/,

diff --cc bin/xt-install-image
Simple merge

diff --cc debian/changelog
Simple merge