Merge 0.8->trunk
authorMatthew Wild <mwild1@gmail.com>
Wed, 1 Jun 2011 23:05:33 +0000 (00:05 +0100)
committerMatthew Wild <mwild1@gmail.com>
Wed, 1 Jun 2011 23:05:33 +0000 (00:05 +0100)
commit4f79d956eb0d29fde0f6516507e564ff7d020a77
tree3f408a36d413cf741c9a211fb55b8f3d0551b652
parente0326f6e45ad06a79602ad4d072ac6c80fb7c9a9
parent093e7bb084c42c8ec56cc94bbd51cff25f94664a
Merge 0.8->trunk