Merge with 0.5
authorMatthew Wild <mwild1@gmail.com>
Tue, 14 Jul 2009 20:04:57 +0000 (21:04 +0100)
committerMatthew Wild <mwild1@gmail.com>
Tue, 14 Jul 2009 20:04:57 +0000 (21:04 +0100)
commitc12e9ebb857d7470794149cbe7bffe9663d8aab4
treeb284c4b4091fa23a34f7fecd8fb6582a44ea8451
parent8e629244a6a682e594a6d91779ffbdb3e060c4e1
parentb4fb8467c4babece6e78bd11b41e9f73d942c69f
Merge with 0.5