Merge branch 'master' of ssh://jra@git.samba.org/data/git/samba
authorJeremy Allison <jra@samba.org>
Thu, 13 Nov 2008 03:27:50 +0000 (19:27 -0800)
committerJeremy Allison <jra@samba.org>
Thu, 13 Nov 2008 03:27:50 +0000 (19:27 -0800)

Trivial merge