Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test
commitd665cecd8b1b40ad30ec435de0bd925cdea24795
authorJeremy Allison <jra@samba.org>
Thu, 17 Apr 2008 16:25:45 +0000 (17 09:25 -0700)
committerJeremy Allison <jra@samba.org>
Thu, 17 Apr 2008 16:25:45 +0000 (17 09:25 -0700)
tree5b88a047da5612183c161f391bb1c70682fbdbc9
parentc003e66ff10b23bb30aef0071ba7a3ae9579174e
parent7c2e735df3d8a4105a4944411d111fc66c13b01f
Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test