Merge branch 'master' into ubuntu-v2.13

diff --cc debian/changelog
index edece713d0e8040ce0e05e6cea5d8de76c1d2390,7b91861fa5f3b99454e46e9c86fd8369f4e80ac2..c4c29644cafcbf79a86d8b00f4f8a87f211efc9a
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,20 -1,20 +1,30 @@@
 +util-linux (2.13~rc3-4ubuntu1) gutsy-UNRELEASED; urgency=low
 +
 +  * Merge from Debian. (LP: #131367)
 +  * Remaining Ubuntu changes:
 +    - Add udev rule for calling /sbin/hwclock --hctosys dynamically:
 +      + debian/hwclock.rules, debian/hwclock.udev: Rule and script.
 +      + debian/rules: Install those.
 +
 + -- LaMont Jones <lamont@ubuntu.com>  Thu,  9 Aug 2007 15:59:41 -0600
 +
  util-linux (2.13~rc3-4) unstable-UNRELEASED; urgency=low
  
-   * mount: make the error message a little more clear
-     when a helper program is missing.
+   * Changes from upstream:
+     - po: gettextizing some overlooked messages.
+     - build-sys: add --disable-makeinstall-chown
+     - docs: add README.licensing
+     - tests: fix ULONG_MAX usage on 32bit machines
+     - chsh: don't use empty shell field in /etc/passwd
+     - more: fix underlining for multibyte chars
+     - login: replace /usr/spool/mail with /var/spool/main in man page
+   * mount: make the error message a little more clear when a helper
+     program is missing.
+   * manpages: cleanup of chrt.1 and taskset.1.  Closes: #427267, #265479
    * hwclock.sh: only report hwclock updated if we did that.  Closes: #436873
+   * update copyright to reflect README.licensing
  
-  -- LaMont Jones <lamont@debian.org>  Thu,  9 Aug 2007 13:48:23 -0600
+  -- LaMont Jones <lamont@debian.org>  Tue, 14 Aug 2007 12:22:34 -0600
  
  util-linux (2.13~rc3-3) unstable; urgency=low