Merge branch 'master' of ssh://jra@git.samba.org/data/git/samba
authorJeremy Allison <jra@samba.org>
Fri, 2 Jan 2009 19:39:04 +0000 (11:39 -0800)
committerJeremy Allison <jra@samba.org>
Fri, 2 Jan 2009 19:39:04 +0000 (11:39 -0800)

Trivial merge