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