Merge commit 'origin/v3-2-test' into v3-2-simo
authorSimo Sorce <idra@samba.org>
Wed, 5 Dec 2007 22:54:50 +0000 (17:54 -0500)
committerSimo Sorce <idra@samba.org>
Wed, 5 Dec 2007 22:54:50 +0000 (17:54 -0500)

Trivial merge