Merge branch 'v4-0-trivial' into v4-0-kvmtest
authorJelmer Vernooij <jelmer@samba.org>
Tue, 19 Feb 2008 03:37:09 +0000 (04:37 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Tue, 19 Feb 2008 03:37:09 +0000 (04:37 +0100)
commita153e7081c92ca851b6f1284d15d00de632bff78
tree10a79d9c7302b94f561aa57bcb24583ead8ddb20
parent12e08782b3bef67395d9508fed9487d0217174d6
parent9368ea67cdbb0d1fe5ef2258cc7e8c20c66e6ecd
Merge branch 'v4-0-trivial' into v4-0-kvmtest
(This used to be commit 2b8d5db1bb21ab3deaa8edbaddceaf23f83b8180)