Merge branch 'next'
authorJustin Sobota <jsobota@ti.com>
Tue, 20 Mar 2012 20:28:30 +0000 (16:28 -0400)
committerJustin Sobota <jsobota@ti.com>
Tue, 20 Mar 2012 20:28:30 +0000 (16:28 -0400)

Trivial merge