Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into samba-3-2...
authorJeremy Allison <jra@samba.org>
Thu, 13 Nov 2008 03:28:04 +0000 (19:28 -0800)
committerJeremy Allison <jra@samba.org>
Thu, 13 Nov 2008 03:28:04 +0000 (19:28 -0800)

Trivial merge