Merge branch 'master' of ssh://jra@git.samba.org/data/git/samba
authorJeremy Allison <jra@samba.org>
Sat, 22 Nov 2008 02:20:33 +0000 (18:20 -0800)
committerJeremy Allison <jra@samba.org>
Sat, 22 Nov 2008 02:20:33 +0000 (18:20 -0800)

Trivial merge