EFL migration revision 67705
authorJaehwan Kim <jae.hwan.kim@samsung.com>
Tue, 14 Feb 2012 08:56:23 +0000 (17:56 +0900)
committerJaehwan Kim <jae.hwan.kim@samsung.com>
Wed, 15 Feb 2012 07:04:40 +0000 (16:04 +0900)
commita03c6a7851967f7958a762e5ae9d7caa0bf7c1c1
treea04348743651d3f9b05908eea72c2b66f0d5ef58
parentbc086f13e931aae82a18a1c41e329a634c2a83a7
parentf26316ff9e520964fd25c7961b925994f00593e3
EFL migration revision 67705
Merge remote branch 'origin/upstream'

Conflicts:
src/lib/edje_entry.c
src/bin/edje_cc_handlers.c
src/lib/Edje.h
src/lib/edje_calc.c
src/lib/edje_entry.c
src/lib/edje_private.h
src/lib/edje_util.c