Merge recent 3.00 changes into 3.10 3.10.01.10_eng
authorChris Ring <cring@ti.com>
Tue, 1 Oct 2013 15:21:47 +0000 (08:21 -0700)
committerChris Ring <cring@ti.com>
Tue, 1 Oct 2013 15:21:47 +0000 (08:21 -0700)

Trivial merge