Merge branch 'v3-2-test' of ssh://git.samba.org/data/git/samba into v3-2-test
authorAlexander Bokovoy <ab@samba.org>
Mon, 21 Apr 2008 07:38:20 +0000 (11:38 +0400)
committerAlexander Bokovoy <ab@samba.org>
Mon, 21 Apr 2008 07:38:20 +0000 (11:38 +0400)
commitff615f232968979f57a31f43a4f668c2c4fd20df
tree8e4d6e1181001dd35e32008a3401020c013e288b
parent09caab9f37d6ecd4fd6fe9ce3c284730b232651a
parent0db7aba8af80a01150d1061a4192ab814e4234b7
Merge branch 'v3-2-test' of ssh://git.samba.org/data/git/samba into v3-2-test
(This used to be commit 2c3ffc1c53550c8e6feeca8fc0270ef9ac1ec70a)