Merge branch 'v3-2-test' of ssh://git.samba.org/data/git/samba into v3-2-test
commit2c3ffc1c53550c8e6feeca8fc0270ef9ac1ec70a
authorAlexander Bokovoy <ab@samba.org>
Mon, 21 Apr 2008 07:38:20 +0000 (21 11:38 +0400)
committerAlexander Bokovoy <ab@samba.org>
Mon, 21 Apr 2008 07:38:20 +0000 (21 11:38 +0400)
tree7a4b7675da13bfbc3120763f3f1ecb8a3f3cfe13
parent8246ffc66e6425809cfb8ca48bb31710dcddbd26
parent14294535512a7f191c5008e622b6708e417854ae
Merge branch 'v3-2-test' of ssh://git.samba.org/data/git/samba into v3-2-test