Merge branch 'master' of ssh://jht@git.samba.org/data/git/samba
authorJohn H Terpstra <jht@samba.org>
Thu, 23 Jul 2009 14:33:06 +0000 (09:33 -0500)
committerJohn H Terpstra <jht@samba.org>
Thu, 23 Jul 2009 14:33:06 +0000 (09:33 -0500)

Trivial merge