Merge remote-tracking branch 'origin/ksII-rm-dev'
authorJohn Dowdal <jdowdal@ti.com>
Tue, 14 May 2013 22:33:17 +0000 (18:33 -0400)
committerJohn Dowdal <jdowdal@ti.com>
Tue, 14 May 2013 22:33:17 +0000 (18:33 -0400)

Trivial merge