Merge branch 'master' of ssh://jra@git.samba.org/data/git/samba
authorJeremy Allison <jra@samba.org>
Tue, 14 Oct 2008 00:27:53 +0000 (17:27 -0700)
committerJeremy Allison <jra@samba.org>
Tue, 14 Oct 2008 00:27:53 +0000 (17:27 -0700)

Trivial merge