Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop
authorroot <root@eddie-desktop.(none)>
Wed, 6 Jul 2011 07:06:30 +0000 (15:06 +0800)
committerroot <root@eddie-desktop.(none)>
Wed, 6 Jul 2011 07:06:30 +0000 (15:06 +0800)

Trivial merge