Merge with 0.4
authorMatthew Wild <mwild1@gmail.com>
Fri, 22 May 2009 12:35:54 +0000 (13:35 +0100)
committerMatthew Wild <mwild1@gmail.com>
Fri, 22 May 2009 12:35:54 +0000 (13:35 +0100)
commit14b07e19c6db6eefe35fac05b1772e7ee9a74436
tree74c807390b58c84373d715b16d7b9228054189db
parent64b65afe2f8caffd77027aa876ee883569866e55
parent5dd6384aa54a7245faa18b685dce6544f9cb66d7
Merge with 0.4