Merge commit 'origin/master' into abartlet-devel
authorAndrew Bartlett <abartlet@samba.org>
Tue, 1 Dec 2009 05:12:53 +0000 (16:12 +1100)
committerAndrew Bartlett <abartlet@samba.org>
Tue, 1 Dec 2009 05:12:53 +0000 (16:12 +1100)

Trivial merge