Merge branch 'improve-displayinfo' into staging-master
authorXizhi Zhu <xizhi.zhu@nokia.com>
Wed, 6 Jul 2011 11:24:58 +0000 (14:24 +0300)
committerXizhi Zhu <xizhi.zhu@nokia.com>
Wed, 6 Jul 2011 11:24:58 +0000 (14:24 +0300)
commite3de11022a6e7c98679f55f6037c649ae847185d
tree2e32664e54c1653a2ffb34cb23d97f5ef954a400
parentd6d39f147445f14e3c21a933ff3b10bf11ffe6a5
parentdacccd7bbc6942a5af6aca3be8fc8e3e1f468329
Merge branch 'improve-displayinfo' into staging-master