Merge with 0.5
authorMatthew Wild <mwild1@gmail.com>
Sun, 27 Sep 2009 12:20:17 +0000 (13:20 +0100)
committerMatthew Wild <mwild1@gmail.com>
Sun, 27 Sep 2009 12:20:17 +0000 (13:20 +0100)
commit40ea669d122588577ab6fb9ba5b2cbc0d63996ec
treed81815c82e1c8e5dc29d2dea6d4c2ca6d62a14bb
parenta2c3a6316c5f464911590103e0645e9ad1c11652
parente7a0f846f6f289cd6fdad9b5ffa5c6e554765657
Merge with 0.5