Merge branch 'master' of ssh://jra@git.samba.org/data/git/samba
authorJeremy Allison <jra@samba.org>
Fri, 10 Apr 2009 05:46:59 +0000 (22:46 -0700)
committerJeremy Allison <jra@samba.org>
Fri, 10 Apr 2009 05:46:59 +0000 (22:46 -0700)

Trivial merge