Merge branch 'master' of ssh://jra@git.samba.org/data/git/samba
authorJeremy Allison <jra@samba.org>
Mon, 20 Oct 2008 23:38:25 +0000 (16:38 -0700)
committerJeremy Allison <jra@samba.org>
Mon, 20 Oct 2008 23:38:25 +0000 (16:38 -0700)

Trivial merge