Merge branch 'master' of http://gtgit01.gt.design.ti.com/git/projects/mcsdk-tools
authorHao Zhang <hzhang@ti.com>
Tue, 25 Oct 2011 13:46:38 +0000 (09:46 -0400)
committerHao Zhang <hzhang@ti.com>
Tue, 25 Oct 2011 13:46:38 +0000 (09:46 -0400)

Trivial merge