Merge remote branch 'origin/upstream' into svn_merge
authorJaehwan Kim <jae.hwan.kim@samsung.com>
Mon, 22 Aug 2011 08:35:21 +0000 (17:35 +0900)
committerJaehwan Kim <jae.hwan.kim@samsung.com>
Mon, 22 Aug 2011 08:35:21 +0000 (17:35 +0900)
commit2c48d04b4be97a13ac2e7c4f22b0127f86a19126
tree645f11c43830808af1aab6f1011df2a6ebe7a927
parent6afe66984110ef28fc8b769c51485b05aacad3f8
parent0975a612957326fb2702b7a3d1a966c4762b666f
Merge remote branch 'origin/upstream' into svn_merge
src/lib/edje_calc.c
src/lib/edje_util.c