Merge branch 'v3-2-test' of ssh://git.samba.org/data/git/samba into ctdb-merge
authorAlexander Bokovoy <ab@samba.org>
Thu, 24 Jan 2008 11:06:22 +0000 (14:06 +0300)
committerAlexander Bokovoy <ab@samba.org>
Thu, 24 Jan 2008 11:06:22 +0000 (14:06 +0300)
commiteba5fbff749b84a3e1bcd1f849c3454417532454
tree42b9da9b96fb26706f4c8486cd01821f83e318f3
parentc17c64530ec479334f88679ef780691e06ccd65a
parent9344628bef74ac759197601dc5dd44514b836e3e
Merge branch 'v3-2-test' of ssh://git.samba.org/data/git/samba into ctdb-merge
(This used to be commit 42d06d41bf2e9fb094f6064dc04f549d880b5f8d)