Merge 0.8->trunk
authorMatthew Wild <mwild1@gmail.com>
Sun, 13 Feb 2011 22:59:27 +0000 (22:59 +0000)
committerMatthew Wild <mwild1@gmail.com>
Sun, 13 Feb 2011 22:59:27 +0000 (22:59 +0000)
commitb9cc81a697a8881cb02ea59acf8bff8297e25151
treea26df63501bbfefcc4971b71c431e6b86bf8411f
parent0e56f7d48799e928e6bec45495abc551a3f5f5ac
parent4f2be6682eda803e3d95ec532f561907e0d8cb4d
Merge 0.8->trunk