Merge branch 'stable/v2.13'

Conflicts:

	NEWS
	configure.ac
	debian/changelog
	po/ca.po
	po/cs.po
	po/da.po
	po/de.po
	po/es.po
	po/et.po
	po/eu.po
	po/fi.po
	po/fr.po
	po/hu.po
	po/id.po
	po/it.po
	po/ja.po
	po/nl.po
	po/pl.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 NEWS
index 4865dccfdfb78c09fda609c2fca13cca1ca74be2,bed93a3fcaf85fd5b8419925a28e6c509e8e77a1..4579cbd52ffb9ac1e7e04e229616be4fa98b98d2
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -1,8 -1,24 +1,16 @@@
 -* see docs/v2.13.1-ReleaseNotes or complete changelog at
 -  ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.13/v2.13.1-ChangeLog
 -
 -util-linux-ng 2.13.1-rc2
 -
 -* see docs/v2.13.1-ReleaseNotes or complete changelog at
 -  ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.13/v2.13.1-rc2-ChangeLog
 -
 -util-linux-ng 2.13.1-rc1
 -
 -* see docs/v2.13.1-ReleaseNotes or complete changelog at
 -  ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.13/v2.13.1-rc1-ChangeLog
 -
 -util-linux-ng 2.13 [28-Aug-2007]
 +util-linux-ng 2.14-rc1
++
 +* see docs/v2.14-ReleaseNotes or complete changelog at
 + ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.14/v2.14-rc1-ChangeLog
 +
+ util-linux-ng 2.13.1.1 [22-Apr-2008]
+ 
+ * see docs/v2.13.1.1-ReleaseNotes or complete changelog at
+   ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.13/v2.13.1.1-ChangeLog
+ 
+ util-linux-ng 2.13.1 [16-Jan-2008]
+ 
 +util-linux-ng 2.13
  
  * see docs/v2.13-ReleaseNotes or complete changelog at
    ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.13/v2.13-ChangeLog

diff --cc debian/changelog
index 5f877bd942461537080af792d5f152158ed1a0e3,40c6b90505db6424dd11636b881cbaa342e073a5..7d204f25efd777e8e6aa994b43e9c45be634c678
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,24 +1,32 @@@
 +util-linux (2.14~rc1-1) experimental; urgency=low
 +
 +  * New upstream version
 +  * control: drop -1 version from libslang2-dev build-dep
 +  * control: standards-version 3.7.3.0
 +
 + -- LaMont Jones <lamont@debian.org>  Thu, 17 Apr 2008 18:19:27 -0600
 +
+ util-linux (2.13.1.1-0) unstable; urgency=low
+ 
+   [Steve Grubb]
+ 
+   * login: audit log injection attack via login
+ 
+   [Karel Zak]
+ 
+   * po: merge changes
+    - po: update it.po (from translationproject.org) (Marco Colombo)
+    - po: update nl.po (from translationproject.org) (Benno Schulenberg)
+   * docs: add v2.13.1.1 ReleaseNotes
+   * build-sys: release++ (2.13.1.1)
+ 
+   [LaMont Jones]
+ 
+   * control: drop -1 version from libslang2-dev build-dep
+   * control: standards-version 3.7.3.0
+ 
+  -- LaMont Jones <lamont@debian.org>  Tue, 22 Apr 2008 22:44:08 -0600
+ 
  util-linux (2.13.1-5) unstable; urgency=low
  
    * Switch to upstream's more-correct fix for LP#206113