Merge branch 'master' of ssh://jra@git.samba.org/data/git/samba
authorJeremy Allison <jra@samba.org>
Thu, 2 Apr 2009 03:20:44 +0000 (20:20 -0700)
committerJeremy Allison <jra@samba.org>
Thu, 2 Apr 2009 03:20:44 +0000 (20:20 -0700)

Trivial merge