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

Trivial merge