Merge branch 'sh/platform-updates' into sh-latest
authorPaul Mundt <[email protected]>
Wed, 18 Jan 2012 11:51:54 +0000 (21:51 +1000)
committerPaul Mundt <[email protected]>
Wed, 18 Jan 2012 11:51:54 +0000 (21:51 +1000)

Trivial merge