Merge 0.8->trunk
authorMatthew Wild <mwild1@gmail.com>
Fri, 25 Feb 2011 03:34:15 +0000 (03:34 +0000)
committerMatthew Wild <mwild1@gmail.com>
Fri, 25 Feb 2011 03:34:15 +0000 (03:34 +0000)
commit5eb7c9c4bc129e5946fb6e08d3c746330564821b
tree2f2739a93ef4932dac807fd5681f16899433b5e2
parentcff7c1f9aa3d96b664d6bf558031012ca032e211
parent9778878e0779f705f62361bc48ea5b2b35392c5d
Merge 0.8->trunk