merge from debian

diff --cc debian/changelog
index 5d6fd7fb18fa9beb8950701c9185bd10e0c8a5fa,296fb8b4bc3f6e06df3cd32abe3096d37e524c8f..f37027781db6a279b90218e6bb843415583348fa
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,13 -1,9 +1,20 @@@
- util-linux (2.13~rc2-2ubuntu1) gutsy; urgency=low
++util-linux (2.13~rc2-3ubuntu1) gutsy; urgency=low
 +
 +  * Merge ubuntu changes:
 +    - Add udev rule for calling /sbin/hwclock --hctosys dynamically:
 +      + debian/hwclock.rules, debian/hwclock.udev: Rule and script.
 +      + debian/rules: Install those.
 +    - use libvolume-id instead of blkid.  This will be true for debian once a
 +      current enough udev is available.
 +
-  -- LaMont Jones <lamont@ubuntu.com>  Wed, 18 Jul 2007 21:09:57 -0600
++ -- LaMont Jones <lamont@ubuntu.com>  Sun, 29 Jul 2007 11:31:21 -0600
++
+ util-linux (2.13~rc2-3) unstable; urgency=low
+ 
+   * add option for 8-bit chars in agetty.  Closes: #221290
+   * Merge upstream fixes (rc2+git)
+ 
+  -- LaMont Jones <lamont@debian.org>  Sat, 28 Jul 2007 22:34:53 -0600
  
  util-linux (2.13~rc2-2) experimental; urgency=low