]> git.ipfire.org Git - thirdparty/dracut.git/commitdiff
Merge commit 'dillow/master'
authorHarald Hoyer <harald@redhat.com>
Fri, 5 Jun 2009 06:47:51 +0000 (08:47 +0200)
committerHarald Hoyer <harald@redhat.com>
Fri, 5 Jun 2009 06:47:51 +0000 (08:47 +0200)
Conflicts:
test/TEST-20-NFS/make-client-root


Trivial merge