Merge with 0.5
authorMatthew Wild <mwild1@gmail.com>
Tue, 13 Oct 2009 10:13:52 +0000 (11:13 +0100)
committerMatthew Wild <mwild1@gmail.com>
Tue, 13 Oct 2009 10:13:52 +0000 (11:13 +0100)
commit154cae8558010dbb85963b04f1dc1cc901bc6d8c
treed2c7357dc8a8824cd9774aea159684bfa2642ac6
parent13cf498934397ff60c2933815cc8e10a09e87cca
parent863f00a39e9e9a50569b3390c5bc16f27c4e88ea
Merge with 0.5