From: LaMont Jones <lamont@mmjgroup.com>
Date: Mon, 27 Aug 2007 15:35:12 +0000 (-0600)
Subject: Merge commit 'origin'
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=26fc58ba626c891df211848faf2f09fba5cf82b7;p=util-linux

Merge commit 'origin'

Conflicts:

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

26fc58ba626c891df211848faf2f09fba5cf82b7