Merge branch 'sh/stable-updates'

This commit is contained in:
Paul Mundt 2009-10-13 12:45:08 +09:00
commit 5852b203ef