From: LaMont Jones <lamont@debian.org>
Date: Wed, 12 Sep 2007 13:04:01 +0000 (-0600)
Subject: Merge branch 'stable/v2.13'
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=758fe83c765d6daf3930bc1fbbb1f3ae2cc1eaa9;p=util-linux

Merge branch 'stable/v2.13'

Conflicts:

	debian/changelog
---

758fe83c765d6daf3930bc1fbbb1f3ae2cc1eaa9
diff --cc debian/changelog
index bd2f0fd1,934230e4..b6764a58
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,9 +1,15 @@@
 +util-linux (2.14~a0-0) experimental-UNRELEASED; urgency=low
 +
 +  * New release
 +
 + -- LaMont Jones <lamont@debian.org>  Fri, 07 Sep 2007 08:52:55 -0600
 +
+ util-linux (2.13-4) unstable; urgency=low
+ 
+   * build: look for fdisk in the right place.  Closes: LP#138040
+ 
+  -- LaMont Jones <lamont@debian.org>  Wed, 12 Sep 2007 06:30:18 -0600
+ 
  util-linux (2.13-3) unstable; urgency=low
  
    * flock.1: typo in man page.  Closes: #440011