From: LaMont Jones <lamont@debian.org>
Date: Thu, 6 Dec 2007 04:30:43 +0000 (-0700)
Subject: Merge commit 'origin/stable/v2.13' into stable/v2.13
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=74e7d7067805fe67ee2a048e66c4ef71935f835d;p=util-linux

Merge commit 'origin/stable/v2.13' into stable/v2.13

Conflicts:

	getopt/getopt.1
---

74e7d7067805fe67ee2a048e66c4ef71935f835d