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)
1  2 
src/lib/canvas/evas_object_textblock.c