Merge branch 'master' of ssh://jra@git.samba.org/data/git/samba
authorJeremy Allison <jra@samba.org>
Thu, 17 Sep 2009 18:11:23 +0000 (11:11 -0700)
committerJeremy Allison <jra@samba.org>
Thu, 17 Sep 2009 18:11:23 +0000 (11:11 -0700)

Trivial merge