Merge branch 'master' of ssh://jra@git.samba.org/data/git/samba
authorJeremy Allison <jra@samba.org>
Wed, 19 Nov 2008 23:06:05 +0000 (15:06 -0800)
committerJeremy Allison <jra@samba.org>
Wed, 19 Nov 2008 23:06:05 +0000 (15:06 -0800)

Trivial merge