Merge branch 'master' of ssh://jra@git.samba.org/data/git/samba
authorJeremy Allison <jra@samba.org>
Wed, 1 Apr 2009 21:03:17 +0000 (14:03 -0700)
committerJeremy Allison <jra@samba.org>
Wed, 1 Apr 2009 21:03:17 +0000 (14:03 -0700)

Trivial merge