Merge branch 'v3-2-test' of ssh://git.samba.org/data/git/samba into v3-2-test
authorAlexander Bokovoy <ab@samba.org>
Thu, 17 Jan 2008 04:26:12 +0000 (07:26 +0300)
committerAlexander Bokovoy <ab@samba.org>
Thu, 17 Jan 2008 04:26:12 +0000 (07:26 +0300)

Trivial merge