Merge 0.8->trunk
authorMatthew Wild <mwild1@gmail.com>
Tue, 11 Jan 2011 22:40:41 +0000 (22:40 +0000)
committerMatthew Wild <mwild1@gmail.com>
Tue, 11 Jan 2011 22:40:41 +0000 (22:40 +0000)
commitfe2f6fd973d4af191204c0f595c916e0da57f03f
tree5bb39e0385de7c74baa32e01eb45a4793edf001b
parentdb42c21cc16e0612fa68d10f2567f1caa8c1b0d8
parent3207c609f3eda359ef8dedfc7b953205ff8b83d0
Merge 0.8->trunk