Merge branch 'v3-2-test' of ssh://git.samba.org/data/git/samba into v3-2-test
authorJelmer Vernooij <jelmer@samba.org>
Sun, 9 Mar 2008 12:51:52 +0000 (13:51 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Sun, 9 Mar 2008 12:51:52 +0000 (13:51 +0100)
(This used to be commit 09e5c6adde5564afc0d1be25f297fbfd284d559f)


Trivial merge