From: LaMont Jones <lamont@mmjgroup.com>
Date: Tue, 28 Aug 2007 03:51:33 +0000 (-0600)
Subject: Merge commit 'origin'
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=da3a62b563b0134fe7f82bca30590b5815933483;p=util-linux

Merge commit 'origin'

Conflicts:

	sys-utils/Makefile.am
	sys-utils/setarch.c
---

da3a62b563b0134fe7f82bca30590b5815933483