Merge 0.7->trunk
authorMatthew Wild <mwild1@gmail.com>
Thu, 25 Mar 2010 12:33:45 +0000 (12:33 +0000)
committerMatthew Wild <mwild1@gmail.com>
Thu, 25 Mar 2010 12:33:45 +0000 (12:33 +0000)
commit3482c2a77b884be60d3dbb3596ae7db2694fe2a4
tree7600bdcb05be2d1105865b176f3395a23efaf70c
parenta93b5a501c74f872acd040d2defb769ecdf5d54e
parentc488a2c728044a5242539dc4f930f67fc647a05e
Merge 0.7->trunk