Merge 0.8->trunk
authorMatthew Wild <mwild1@gmail.com>
Fri, 7 Jan 2011 04:42:01 +0000 (04:42 +0000)
committerMatthew Wild <mwild1@gmail.com>
Fri, 7 Jan 2011 04:42:01 +0000 (04:42 +0000)
commitc0d4f7444ccb646cd748fe91d7fe3be9e31abf9e
tree19166e73e0df8ab5bf5e87d860ee7602b9a9297f
parent2349d61b5966bb55048df093f59ef6fb6997f47d
parent1e5eeaea59f89ce9bf2141b64093f3cf5c435d3b
Merge 0.8->trunk