Merge branch 'next' of gtgit01.gt.design.ti.com:git/projects/mcsdk-tools into next
authorJingting Zhou <zhoujt@ti.com>
Fri, 24 Aug 2012 17:55:24 +0000 (13:55 -0400)
committerJingting Zhou <zhoujt@ti.com>
Fri, 24 Aug 2012 17:55:24 +0000 (13:55 -0400)

Trivial merge