Merge branch 'common/core' into sh-latest
Paul Mundt [Mon, 8 Aug 2011 07:33:54 +0000 (16:33 +0900)]

Trivial merge