Merge branch 'master' into ubuntu-v2.13

Conflicts:

	debian/changelog

diff --cc debian/changelog
index d3095bfe57134b1852318172c3e33ee144b94d5d,d3ee318a63c4eead6ebc4aeee24d536408ca099a..2679578fc2aeb5ad976fdfcb24101385568a5291
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,9 +1,27 @@@
++util-linux (2.13~rc3-2ubuntu1) gutsy; urgency=low
++
++  * New debian version.  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>  Wed,  8 Aug 2007 13:22:04 -0600
++
+ util-linux (2.13~rc3-2) unstable; urgency=low
+ 
+   * mount should Suggest nfs-common, not Recommend it.
+ 
+  -- LaMont Jones <lamont@debian.org>  Wed,  8 Aug 2007 13:17:42 -0600
+ 
 +util-linux (2.13~rc3-1ubuntu1) gutsy; urgency=low
 +
 +  * Merge ubuntu changes into a new Debian version.  Remaining:
 +    - 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>  Wed,  8 Aug 2007 11:57:03 -0600
 +
  util-linux (2.13~rc3-1) unstable; urgency=low
  
    * New upstream version

diff --cc debian/control
Simple merge