Merge up current work from trunk
authorBrian Aker <brian@tangent.org>
Tue, 29 Nov 2011 23:28:01 +0000 (15:28 -0800)
committerBrian Aker <brian@tangent.org>
Tue, 29 Nov 2011 23:28:01 +0000 (15:28 -0800)
commit07affbd49a702e4dd9db927d9f19ffe3e3854038
tree9bf44650008df88627519200a37525047bdb770d
parentde4a9c2f387cb27a298146ab6eae50bd1f35ce56
parentd4f9faac5b2532375157aac90c36ace0261c867e
Merge up current work from trunk