Merge with 0.5
authorMatthew Wild <mwild1@gmail.com>
Fri, 2 Oct 2009 21:37:44 +0000 (22:37 +0100)
committerMatthew Wild <mwild1@gmail.com>
Fri, 2 Oct 2009 21:37:44 +0000 (22:37 +0100)
commita97e9563f6fea8201de30f36144a2e18f00b21fa
treea23c515ac78b34210ad704570c27b31317ec90d7
parent894e410875acd43bbcdb9063465917a5147bc446
parent70e19011df23d77977fcf644d577bb6232b52bd4
Merge with 0.5