Merge branch 'ksII-rm-dev'
authorJustin Sobota <jsobota@ti.com>
Wed, 10 Jul 2013 15:35:15 +0000 (11:35 -0400)
committerJustin Sobota <jsobota@ti.com>
Wed, 10 Jul 2013 15:35:15 +0000 (11:35 -0400)

Trivial merge