Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop
authorlzg <lzg@rockchip.com>
Fri, 12 Aug 2011 08:00:39 +0000 (16:00 +0800)
committerlzg <lzg@rockchip.com>
Fri, 12 Aug 2011 08:00:39 +0000 (16:00 +0800)

Trivial merge