Merge branch 'develop' of lyx@10.10.10.29:/home/rockchip/kernel into develop
authorlyx <lyx@rock-chips.com>
Wed, 23 Feb 2011 07:46:34 +0000 (23:46 -0800)
committerlyx <lyx@rock-chips.com>
Wed, 23 Feb 2011 07:46:34 +0000 (23:46 -0800)

Trivial merge