Merge 0.6/MattJ -> 0.6
authorMatthew Wild <mwild1@gmail.com>
Sat, 3 Apr 2010 21:26:14 +0000 (22:26 +0100)
committerMatthew Wild <mwild1@gmail.com>
Sat, 3 Apr 2010 21:26:14 +0000 (22:26 +0100)
commitf22e235217e21484315f8e735722f0a3cbc6fb4d
treeb394dce197670b8b943f333dd903fb4a91a25028
parentd310f737167f2f8782a566cf84c10001aeadadc7
parent527c843d6d3d87c13257af71fe7f82663aefb443
Merge 0.6/MattJ -> 0.6