Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test
authorJeremy Allison <jra@samba.org>
Tue, 15 Jan 2008 23:09:35 +0000 (15:09 -0800)
committerJeremy Allison <jra@samba.org>
Tue, 15 Jan 2008 23:09:35 +0000 (15:09 -0800)
(This used to be commit 0d989bf90b9b75a057b572bb4369ee3126db1fb8)


Trivial merge