Merge branch 'master' of ssh://jra@git.samba.org/data/git/samba
authorJeremy Allison <jra@samba.org>
Thu, 18 Dec 2008 01:24:54 +0000 (17:24 -0800)
committerJeremy Allison <jra@samba.org>
Thu, 18 Dec 2008 01:24:54 +0000 (17:24 -0800)

Trivial merge