Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test
authorJeremy Allison <jra@samba.org>
Wed, 11 Feb 2009 22:37:27 +0000 (14:37 -0800)
committerJeremy Allison <jra@samba.org>
Wed, 11 Feb 2009 22:37:27 +0000 (14:37 -0800)

Trivial merge