Merge remote branch 'origin/upstream' into svn_merge
authorJaehwan Kim <jae.hwan.kim@samsung.com>
Wed, 17 Aug 2011 08:31:53 +0000 (17:31 +0900)
committerJaehwan Kim <jae.hwan.kim@samsung.com>
Wed, 17 Aug 2011 08:31:53 +0000 (17:31 +0900)
commit8166dd10e90ba0be7e0c35df760b60eb8c3a2bdd
tree1e2d9337581247fb6202015d488f48baba980088
parente406fb4919069799b9b2ee8ff173a17b19f4aeda
parent1bd38a1a06e3936db616bf79383bc681113cfcc4
Merge remote branch 'origin/upstream' into svn_merge
src/lib/canvas/evas_object_textblock.c