From: Harald Hoyer <harald@redhat.com>
Date: Fri, 5 Jun 2009 06:47:51 +0000 (+0200)
Subject: Merge commit 'dillow/master'
X-Git-Tag: 0.1~106
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7e05060f77425577e8c71928319b43f9bc969fbf;p=thirdparty%2Fdracut.git

Merge commit 'dillow/master'

Conflicts:
	test/TEST-20-NFS/make-client-root
---

7e05060f77425577e8c71928319b43f9bc969fbf