Merge branch 'v3-6-test' of ssh://git.samba.org/data/git/samba into v3-6-test
authorJeremy Allison <jra@samba.org>
Tue, 14 Dec 2010 01:08:08 +0000 (17:08 -0800)
committerJeremy Allison <jra@samba.org>
Tue, 14 Dec 2010 01:08:08 +0000 (17:08 -0800)

Trivial merge