Merge branch 'master' of gtgit01.gt.design.ti.com:git/projects/mcsdk-tools
authorJingting Zhou <zhoujt@ti.com>
Fri, 17 Aug 2012 16:22:51 +0000 (12:22 -0400)
committerJingting Zhou <zhoujt@ti.com>
Fri, 17 Aug 2012 16:22:51 +0000 (12:22 -0400)

Trivial merge