Merge remote-tracking branch 'arnie/3.00.00.11_eng' into tmp
authorChris Ring <cring@ti.com>
Tue, 5 Mar 2013 23:45:15 +0000 (15:45 -0800)
committerChris Ring <cring@ti.com>
Tue, 5 Mar 2013 23:45:15 +0000 (15:45 -0800)

Trivial merge