Merge branch 'v3-2-test' of ssh://git.samba.org/data/git/samba into v3-2-test
authorAlexander Bokovoy <ab@samba.org>
Wed, 16 Jan 2008 20:24:44 +0000 (23:24 +0300)
committerAlexander Bokovoy <ab@samba.org>
Wed, 16 Jan 2008 20:24:44 +0000 (23:24 +0300)
commitb01f34141509c90b12003786957790866c286cba
tree3d0afb7b9097ce6a13b60a90a475aea4a6a4d1e1
parenta40f68eac1d421c96fc3e10e5a7494dc2c5a124e
parent5838a9f556f151dc7c1773dcdc598b8ba79fca44
Merge branch 'v3-2-test' of ssh://git.samba.org/data/git/samba into v3-2-test