Merge with 0.5
authorMatthew Wild <mwild1@gmail.com>
Thu, 20 Aug 2009 15:30:32 +0000 (16:30 +0100)
committerMatthew Wild <mwild1@gmail.com>
Thu, 20 Aug 2009 15:30:32 +0000 (16:30 +0100)
commit1fcbec749479d8e6f4be2c336e3711fe3d191bde
tree77aa36934a8b2544b1d57851c707bab2864e7e0f
parent95c64b70f7cb28745222146784181e866b515069
parenta43380b10887ca6b775d4435cd0492fad319c038
Merge with 0.5