Merge branch 'v3-2-test' of ssh://git.samba.org/data/git/samba into v3-2-test
commit7135d2aea5a68a79e2a77d4a02219436f5e154cc
authorDerrell Lipman <derrell.lipman@unwireduniverse.com>
Thu, 17 Jan 2008 16:50:41 +0000 (17 11:50 -0500)
committerDerrell Lipman <derrell.lipman@unwireduniverse.com>
Thu, 17 Jan 2008 16:50:41 +0000 (17 11:50 -0500)
treea88f17c4e8118d525cde3de564354960aba383f3
parent41ad5c7700c5ef3839c0629ee5eb42ec0fe61da6
parenta3b36c3cb0fe5f3e78c200290afa59829934f496
Merge branch 'v3-2-test' of ssh://git.samba.org/data/git/samba into v3-2-test