Merge branch 'sh/stable-updates'
Paul Mundt [Mon, 5 Apr 2010 03:21:09 +0000 (12:21 +0900)]

Trivial merge