Merge 0.7/MattJ with 0.7
authorMatthew Wild <mwild1@gmail.com>
Mon, 17 May 2010 10:57:01 +0000 (11:57 +0100)
committerMatthew Wild <mwild1@gmail.com>
Mon, 17 May 2010 10:57:01 +0000 (11:57 +0100)
commit28bec28b434031d2649f84295157006b31b17a4c
treef27c9936d198ab2b6981b43ddba5d6d4bf6010dd
parentb48dbf2b1c6baafccff16b34a581d37672cfb793
parenteda4cb549bb4c1aa3938f595abe2709acbed27ce
Merge 0.7/MattJ with 0.7