Merge branch 'v3-2-test' of ssh://git.samba.org/data/git/samba into v3-2-simo
authorSimo Sorce <idra@samba.org>
Wed, 5 Dec 2007 22:55:50 +0000 (17:55 -0500)
committerSimo Sorce <idra@samba.org>
Wed, 5 Dec 2007 22:55:50 +0000 (17:55 -0500)
(This used to be commit 78581ad070dd6e1886dd2094cf75ebebbb83d9a6)


Trivial merge