Merge branch 'v3-2-test' of ssh://git.samba.org/data/git/samba into ctdb-merge
authorAlexander Bokovoy <ab@samba.org>
Wed, 16 Jan 2008 09:57:15 +0000 (12:57 +0300)
committerAlexander Bokovoy <ab@samba.org>
Wed, 16 Jan 2008 09:57:15 +0000 (12:57 +0300)
(This used to be commit 17b2bea7093681a4c4119f9fe7104c018fd0af6f)


Trivial merge