Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test
authorJeremy Allison <jra@samba.org>
Thu, 29 Nov 2007 17:48:33 +0000 (09:48 -0800)
committerJeremy Allison <jra@samba.org>
Thu, 29 Nov 2007 17:48:33 +0000 (09:48 -0800)
(This used to be commit aff5a52136b85fe82c4acb08d12009187d1fe6c7)


Trivial merge