Merge branch 'master' of ssh://jra@git.samba.org/data/git/samba
authorJeremy Allison <jra@samba.org>
Thu, 25 Sep 2008 17:07:44 +0000 (10:07 -0700)
committerJeremy Allison <jra@samba.org>
Thu, 25 Sep 2008 17:07:44 +0000 (10:07 -0700)

Trivial merge