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)
commit732d2bba83c68d337a4a0290245ba8b3eb0635dd
tree866413fa344d26ed91ec027462f82b3c6a06b14d
parent3a5e2f9ba3131a2a264e21640db8bea255fe9ea3
parentd0dfdab85ac751c62b0a6d6e6b1ff128940098ed
Merge branch 'v4-0-trivial' into v4-0-kvmtest