From: LaMont Jones <lamont@debian.org>
Date: Thu, 13 Mar 2008 15:55:49 +0000 (-0600)
Subject: Merge branch 'stable/v2.13'
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2ce90f44f0ef59f4a5039652c4625ea6a750ab22;p=util-linux

Merge branch 'stable/v2.13'

Conflicts:

	disk-utils/mkswap.8
	disk-utils/mkswap.c
---

2ce90f44f0ef59f4a5039652c4625ea6a750ab22