Merge branch 'sh/platform-updates' into sh-latest
authorPaul Mundt <[email protected]>
Tue, 17 Jan 2012 12:55:28 +0000 (22:55 +1000)
committerPaul Mundt <[email protected]>
Tue, 17 Jan 2012 12:55:28 +0000 (22:55 +1000)

Trivial merge