Merge with 0.7
authorMatthew Wild <mwild1@gmail.com>
Sun, 21 Feb 2010 17:33:37 +0000 (17:33 +0000)
committerMatthew Wild <mwild1@gmail.com>
Sun, 21 Feb 2010 17:33:37 +0000 (17:33 +0000)
commit97856a00ed61c2d408b64b175e7a196f481cd442
treeb76363fe8d32c4d662e93d018b57b77a8261838e
parent02674f20543e229b06aa81e42963ffd0aa099740
parent122dfbed4e48768fd53a7f56c2f87bdf9ec762ff
Merge with 0.7