Merge branch 'master' of ssh://git.samba.org/data/git/samba
authorSimo Sorce <idra@samba.org>
Fri, 16 Jul 2010 13:57:03 +0000 (09:57 -0400)
committerSimo Sorce <idra@samba.org>
Fri, 16 Jul 2010 13:57:03 +0000 (09:57 -0400)

Trivial merge