Merge branch 'master' of ssh://jra@git.samba.org/data/git/samba
authorJeremy Allison <jeremy@jeremy-desktop.(none)>
Tue, 23 Dec 2008 18:43:02 +0000 (10:43 -0800)
committerJeremy Allison <jeremy@jeremy-desktop.(none)>
Tue, 23 Dec 2008 18:43:02 +0000 (10:43 -0800)

Trivial merge