Merge 0.8->trunk
authorMatthew Wild <mwild1@gmail.com>
Fri, 7 Jan 2011 11:59:05 +0000 (11:59 +0000)
committerMatthew Wild <mwild1@gmail.com>
Fri, 7 Jan 2011 11:59:05 +0000 (11:59 +0000)
commitb9b20aa3f85ac7d9c5a8b0cce21b5b490969ceaf
treeabd3446bd90c35e108a9336c9865f85d34eac4f5
parentca98ed8a65d61adf91352c3cb9f97900d968a9fa
parentd399a0e818e202e0d4218af3fbd7712e8e94d5e6
Merge 0.8->trunk