Merge branch 'master' of ssh://jra@git.samba.org/data/git/samba
authorJeremy Allison <jra@samba.org>
Thu, 8 Oct 2009 22:36:24 +0000 (15:36 -0700)
committerJeremy Allison <jra@samba.org>
Thu, 8 Oct 2009 22:36:24 +0000 (15:36 -0700)

Trivial merge