Merge remote branch 'origin/master' into alpha11release
authorAndrew Bartlett <abartlet@samba.org>
Mon, 11 Jan 2010 06:10:32 +0000 (17:10 +1100)
committerAndrew Bartlett <abartlet@samba.org>
Mon, 11 Jan 2010 06:10:32 +0000 (17:10 +1100)

Trivial merge