Merge trunk work that had gotten diverged.
authorRobert Collins <robertc@robertcollins.net>
Mon, 31 Oct 2011 07:56:59 +0000 (20:56 +1300)
committerRobert Collins <robertc@robertcollins.net>
Mon, 31 Oct 2011 07:56:59 +0000 (20:56 +1300)
commit81aa7596833daa779ddfb3eb352e9b8c64e947c6
treee0ee358d56b3bc39c11b0d3ec1dd6b63af19c02a
parent0401a214b905783cbbbd5527a98a11eff49dff5e
parentd85610fab1b0ed73df9b59f813ff7cd683d6e101
Merge trunk work that had gotten diverged.
NEWS