Merge from master for mcsdk-210
authorSajesh Kumar Saran <sajesh@ti.com>
Fri, 3 Feb 2012 20:40:16 +0000 (15:40 -0500)
committerSajesh Kumar Saran <sajesh@ti.com>
Fri, 3 Feb 2012 20:40:16 +0000 (15:40 -0500)

Trivial merge