Merge 2610c05b5b95cc7036b3d6dfb894c6cfbdb68483 as Samba-4.0alpha16
authorAndrew Bartlett <abartlet@samba.org>
Fri, 24 Jun 2011 06:26:23 +0000 (16:26 +1000)
committerAndrew Bartlett <abartlet@samba.org>
Fri, 24 Jun 2011 06:26:23 +0000 (16:26 +1000)

Trivial merge