Merge branch 'sh/urgent' into sh-latest
Paul Mundt [Tue, 10 Jan 2012 07:37:52 +0000 (16:37 +0900)]

Trivial merge