Merge 0.8->trunk
authorMatthew Wild <mwild1@gmail.com>
Fri, 18 Mar 2011 10:33:38 +0000 (10:33 +0000)
committerMatthew Wild <mwild1@gmail.com>
Fri, 18 Mar 2011 10:33:38 +0000 (10:33 +0000)
commit2a1848524f5cc3a34d1021cfd07ee811bf115831
treea6d0807e4dba931a6e0d15137416c3a532c2161f
parentc66cc52a698c80e695669910c338fca24a15fd28
parent0912ab5a70411aff0ad44bbc8f2e6c17f557eb51
Merge 0.8->trunk