Merge commit 'origin/master' into abartlet-devel
authorAndrew Bartlett <abartlet@samba.org>
Wed, 9 Dec 2009 00:53:45 +0000 (11:53 +1100)
committerAndrew Bartlett <abartlet@samba.org>
Wed, 9 Dec 2009 00:53:45 +0000 (11:53 +1100)

Trivial merge