Merge with 0.5
authorMatthew Wild <mwild1@gmail.com>
Sun, 12 Jul 2009 14:23:39 +0000 (15:23 +0100)
committerMatthew Wild <mwild1@gmail.com>
Sun, 12 Jul 2009 14:23:39 +0000 (15:23 +0100)
commite403a4a72d42850b0bb1de63dd2fc89c5f311f11
treef8086a815fdbdd75e96a3092a58c6294af909b60
parent629944d986162f06a30c2295bc8455d1245f226e
parentcdf63f83c6a1f44f75348b4b9fa044184f384818
Merge with 0.5