Merge branch 'master' of gtgit01.gt.design.ti.com:git/projects/mcsdk-tools
authorSam Nelson <sam.nelson@ti.com>
Fri, 30 May 2014 20:15:30 +0000 (16:15 -0400)
committerSam Nelson <sam.nelson@ti.com>
Fri, 30 May 2014 20:15:30 +0000 (16:15 -0400)

Trivial merge