Merge branch 'sh/stable-updates'
Paul Mundt [Fri, 5 Feb 2010 03:16:39 +0000 (12:16 +0900)]

Trivial merge