Merge branch 'v3-4-test' of ssh://jra@git.samba.org/data/git/samba into v3-4-test
authorJeremy Allison <jra@samba.org>
Tue, 17 Mar 2009 22:38:07 +0000 (15:38 -0700)
committerJeremy Allison <jra@samba.org>
Tue, 17 Mar 2009 22:38:07 +0000 (15:38 -0700)

Trivial merge