Merge branch 'tmp-mike2' of gtgit01.gt.design.ti.com:git/teams/mmi/ibl into tmp-mike2
authorMike Line <m-line1@ti.com>
Wed, 27 Oct 2010 17:40:49 +0000 (13:40 -0400)
committerMike Line <m-line1@ti.com>
Wed, 27 Oct 2010 17:40:49 +0000 (13:40 -0400)

Trivial merge