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