Merge branch 'v4-0-trivial' into v4-0-kvmtest
authorJelmer Vernooij <jelmer@samba.org>
Tue, 19 Feb 2008 13:33:05 +0000 (14:33 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Tue, 19 Feb 2008 13:33:05 +0000 (14:33 +0100)
commit12ea7dd32513b2f299e24ae1645b821f8e6597e6
treeb8ac430836f7a99a7157f6c3f175b74e82907194
parent33f63de66bb16c4ca96255a17975268a7d958281
parentb617f58cc39ffb5e7f775b88887bcf9112b1ded1
Merge branch 'v4-0-trivial' into v4-0-kvmtest
(This used to be commit 732d2bba83c68d337a4a0290245ba8b3eb0635dd)