Merge branch 'master' of ssh://jra@git.samba.org/data/git/samba
authorJeremy Allison <jra@samba.org>
Thu, 29 Jan 2009 23:31:56 +0000 (15:31 -0800)
committerJeremy Allison <jra@samba.org>
Thu, 29 Jan 2009 23:31:56 +0000 (15:31 -0800)

Trivial merge