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)
commit42d06d41bf2e9fb094f6064dc04f549d880b5f8d
tree0a97ef16986a25683e5e6f68208c9f3162d38220
parentcf1f90ad7a79dbe5926018790bb50d4e3b36cc7b
parentf1d7de462cf0f64648a3a1fc6f0c64a7bbdb3c2a
Merge branch 'v3-2-test' of ssh://git.samba.org/data/git/samba into ctdb-merge