Merge branch 'master' of git+ssh://git.samba.org/data/git/samba
authorJohn H Terpstra <jht@samba.org>
Wed, 16 Jun 2010 13:57:44 +0000 (08:57 -0500)
committerJohn H Terpstra <jht@samba.org>
Wed, 16 Jun 2010 13:57:44 +0000 (08:57 -0500)

Trivial merge