Merge up all of development trunk.
authorBrian Aker <brian@tangent.org>
Wed, 19 Oct 2011 01:50:52 +0000 (18:50 -0700)
committerBrian Aker <brian@tangent.org>
Wed, 19 Oct 2011 01:50:52 +0000 (18:50 -0700)
commit46394c394ae0348ddb321673d4e8fcdff15a7a02
treeb84fd202486e38a401dd7851802975c6c0fb5c63
parent3e9d8da7a1f4695b192f099e32d0461858bdc068
parent2ba52818375fa389a777cf3a2ab3a0249d8a7864
Merge up all of development trunk.