Merge 0.8->trunk
authorMatthew Wild <mwild1@gmail.com>
Tue, 11 Jan 2011 05:31:29 +0000 (05:31 +0000)
committerMatthew Wild <mwild1@gmail.com>
Tue, 11 Jan 2011 05:31:29 +0000 (05:31 +0000)
commit8e90ab391112aa88164f8332a6b52d29aa9d6bde
tree9955881f795b0517126ec0fc67fe0982f212102a
parentf3c3acf819d5a2511a39aecf17feab537bbcc07f
parentc0d63b78911a777a57bd018358408156f383a3f9
Merge 0.8->trunk