Merge branch 'master' of ssh://git.samba.org/data/git/samba
authorSimo Sorce <idra@samba.org>
Mon, 19 Jul 2010 17:48:31 +0000 (13:48 -0400)
committerSimo Sorce <idra@samba.org>
Mon, 19 Jul 2010 17:48:31 +0000 (13:48 -0400)

Trivial merge