Merge with 0.5
authorMatthew Wild <mwild1@gmail.com>
Mon, 5 Oct 2009 16:57:59 +0000 (17:57 +0100)
committerMatthew Wild <mwild1@gmail.com>
Mon, 5 Oct 2009 16:57:59 +0000 (17:57 +0100)
commita87e479b72b1ae23471a43d069a1f28f4d4522e7
tree67c29436216c0e2fe8e472d19d88081cce1cc5f4
parent5c50795d90106ed4d89a2ef4ff0a103fb69c34d5
parentd6b5e91cf5d96d5c3cb3619083e06080778ecb75
Merge with 0.5