Merge branch 'sh/stable-updates'

This commit is contained in:
Paul Mundt 2009-12-21 11:58:17 +09:00
commit d0b873fc73