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)
commitbd11ec4faa0517cfbd5829012682e05be17e77d6
treef37ebd7d41b4294fd2f37add5a90381cd734f545
parent18530985ec301b117096d7548108db827e4999d1
parent3609c7433d17d78aceb1806340f53f7a2e23c9e8
Merge commit 'origin/master' into abartlet-devel