Merge branch 'master' of ssh://jra@git.samba.org/data/git/samba
authorJeremy Allison <jra@samba.org>
Mon, 1 Dec 2008 21:32:35 +0000 (13:32 -0800)
committerJeremy Allison <jra@samba.org>
Mon, 1 Dec 2008 21:32:35 +0000 (13:32 -0800)

Trivial merge