Merge branch 'v3-2-test' of ssh://git.samba.org/data/git/samba into v3-2-simo
authorSimo Sorce <idra@samba.org>
Wed, 16 Jan 2008 17:06:34 +0000 (12:06 -0500)
committerSimo Sorce <idra@samba.org>
Wed, 16 Jan 2008 17:06:34 +0000 (12:06 -0500)

Trivial merge