Merge branch 'master' of ssh://git.samba.org/data/git/samba
authorSimo Sorce <idra@samba.org>
Fri, 16 Jul 2010 00:50:06 +0000 (20:50 -0400)
committerSimo Sorce <idra@samba.org>
Fri, 16 Jul 2010 00:50:06 +0000 (20:50 -0400)

Trivial merge