Merge branch 'develop-3.0-rk30' of ssh://10.10.10.29/rk/kernel into develop-3.0-rk30
authoryxj <yxj@I7-CH.(none)>
Wed, 22 Feb 2012 06:39:17 +0000 (14:39 +0800)
committeryxj <yxj@I7-CH.(none)>
Wed, 22 Feb 2012 06:39:17 +0000 (14:39 +0800)

Trivial merge