Merge 0.7->trunk
authorMatthew Wild <mwild1@gmail.com>
Wed, 2 Jun 2010 20:34:16 +0000 (21:34 +0100)
committerMatthew Wild <mwild1@gmail.com>
Wed, 2 Jun 2010 20:34:16 +0000 (21:34 +0100)
commit4d04048d759cb3bd0d162e5b18942e69335b7350
treeb671d41b5b0f100f4c0ae486e603143bb97338f9
parentce1cdda04caa6f550beb6ccaaf12808eb654031a
parent150677b4adb5eb9335ca6fb0bcc3bc75b7f007bb
Merge 0.7->trunk