Merge branch 'master' into ubuntu-v2.13

Conflicts:

	debian/changelog
	debian/control
	debian/rules

Signed-off-by: LaMont Jones <lamont@mmjgroup.com>

diff --cc debian/changelog
index f37027781db6a279b90218e6bb843415583348fa,b32fd531b7c1752a603e5d282ea8ae29678da81c..92f6057275a9412468d139b1fa0366aa0ad77f1c
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,14 -1,30 +1,41 @@@
+ util-linux (2.13~rc2-6) unstable-UNRELEASED; urgency=low
+ 
+   * More fixes from upstream
+   * swapoff: handle UUID= and LABEL=.  Closes: #435555
+   * mount.preinst: deal with no /proc/mounts.
+ 
+  -- LaMont Jones <lamont@debian.org>  Fri,  3 Aug 2007 09:56:43 -0600
+ 
+ util-linux (2.13~rc2-5) unstable; urgency=low
+ 
+   * mount.preinst:
+     - check the right directory for mount.nfs.
+       Closes: #435307, #435414, #435223
+     - look for ' nfs ' mounts.  Closes: #435305
+ 
+  -- LaMont Jones <lamont@debian.org>  Tue, 31 Jul 2007 22:34:08 -0600
+ 
+ util-linux (2.13~rc2-4) unstable; urgency=low
+ 
+   * switch to using libvolume-id-dev
+   * Recommend: nfs-common so that portmap doesn't become defacto-Required.
+     NFS mounts will not work unless nfs-common is upgraded to at least the
+     Recommended version, so now mount.preinst will fail if there are NFS
+     mounts and no /usr/sbin/mount.nfs.  Closes: #435204, #435223, #435125
+ 
+  -- LaMont Jones <lamont@debian.org>  Mon, 30 Jul 2007 08:07:37 -0600
+ 
 +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>  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

diff --cc debian/control
Simple merge

diff --cc debian/rules
Simple merge