Merge branch 'stable/v2.13'

Conflicts:

	NEWS
	configure.ac
	debian/changelog
	mount/lomount.c
	mount/mount.c
	po/ca.po
	po/cs.po
	po/da.po
	po/de.po
	po/es.po
	po/et.po
	po/fi.po
	po/fr.po
	po/hu.po
	po/id.po
	po/it.po
	po/ja.po
	po/nl.po
	po/pt_BR.po
	po/ru.po
	po/sl.po
	po/sv.po
	po/tr.po
	po/uk.po
	po/util-linux-ng.pot
	po/vi.po

diff --cc debian/changelog
index 5824bbec1c40ccdb615f196a0aff069797b6e90e,8e13288774466c516c376f9dd270de50dceff767..22c968d3e9a918570d0df3b9bf963a86429f5e11
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,50 +1,57 @@@
 +util-linux (2.14~a0-0) experimental-UNRELEASED; urgency=low
 +
 +  * Start new release
 +  * DO NOT EDIT: changelog is built from commit messages
 +
 + -- LaMont Jones <lamont@debian.org>  Thu, 11 Oct 2007 21:01:08 -0600
 +
+ util-linux (2.13-12) unstable; urgency=low
+ 
+   * meta: drop Conflicts: bsdmainutils too
+ 
+  -- LaMont Jones <lamont@debian.org>  Mon, 19 Nov 2007 19:30:23 -0700
+ 
+ util-linux (2.13-11) unstable; urgency=low
+ 
+   [LaMont Jones]
+ 
+   * cal comes from bsdmainutils as well.  Drops Replaces: completely.
+ 
+   [Pascal Terjan]
+ 
+   * docs: fix ChangeLog URL
+ 
+   [Gabor Kelemen]
+ 
+   * po: update hu.po (from translationproject.org)
+ 
+   [Karel Zak]
+ 
+   * losetup: fix errno usage
+   * po: update po files
+ 
+   [Lauri Nurmi]
+ 
+   * po: update fi.po (from translationproject.org)
+ 
+  -- LaMont Jones <lamont@debian.org>  Wed, 14 Nov 2007 22:24:36 -0700
+ 
+ util-linux (2.13-10) unstable; urgency=low
+ 
+   [KaiGai Kohei]
+ 
+   * mkswap: possible to crash with SELinux relabeling support
+ 
+   [Karel Zak]
+ 
+   * docs: add info about .bugfix releases and branches
+ 
+   [LaMont Jones]
+ 
+   * build: don't deliver col* and ul as part of bsdutils for now.  Closes: #446939
+ 
+  -- LaMont Jones <lamont@debian.org>  Mon, 29 Oct 2007 14:29:49 -0600
+ 
  util-linux (2.13-9) unstable; urgency=low
  
    [LaMont Jones]