Merge 0.8->trunk
authorMatthew Wild <mwild1@gmail.com>
Fri, 7 Jan 2011 05:11:17 +0000 (05:11 +0000)
committerMatthew Wild <mwild1@gmail.com>
Fri, 7 Jan 2011 05:11:17 +0000 (05:11 +0000)
commitca98ed8a65d61adf91352c3cb9f97900d968a9fa
tree5223ae6345002c076cce53b7b6dc873228adabe8
parent4bc879d9ac317c5a92a7652f5c2c36344da90fc5
parentc0d4f7444ccb646cd748fe91d7fe3be9e31abf9e
Merge 0.8->trunk