Merge branch 'master' of ssh://jra@git.samba.org/data/git/samba
authorJeremy Allison <jra@samba.org>
Tue, 11 Nov 2008 18:20:24 +0000 (10:20 -0800)
committerJeremy Allison <jra@samba.org>
Tue, 11 Nov 2008 18:20:24 +0000 (10:20 -0800)

Trivial merge