Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test
authorJeremy Allison <jra@samba.org>
Thu, 21 Feb 2008 17:53:00 +0000 (09:53 -0800)
committerJeremy Allison <jra@samba.org>
Thu, 21 Feb 2008 17:53:00 +0000 (09:53 -0800)
(This used to be commit beb0a76b93f9dd054dbc4192516e7008e59b27d9)


Trivial merge