Merge with 0.5
authorMatthew Wild <mwild1@gmail.com>
Wed, 22 Jul 2009 20:35:58 +0000 (21:35 +0100)
committerMatthew Wild <mwild1@gmail.com>
Wed, 22 Jul 2009 20:35:58 +0000 (21:35 +0100)
commit7baa83edbd77d8d0a48b244160ef33d435b7f911
treeeedb4bef91050b9b02de9e4577a70d7aac10d220
parentee85d0c79aa2d7bfa3f1280f19792e1d007b6519
parentd8be5b007899345581b30938e81eca06adb24d64
Merge with 0.5