Merge branch 'master' of ssh://jra@git.samba.org/data/git/samba
authorJeremy Allison <jra@samba.org>
Thu, 20 Nov 2008 00:36:59 +0000 (16:36 -0800)
committerJeremy Allison <jra@samba.org>
Thu, 20 Nov 2008 00:36:59 +0000 (16:36 -0800)

Trivial merge