upstream merge
authorJiyoun Park <jy0703.park@samsung.com>
Fri, 29 Jun 2012 05:26:00 +0000 (14:26 +0900)
committerJiyoun Park <jy0703.park@samsung.com>
Fri, 29 Jun 2012 05:26:00 +0000 (14:26 +0900)
commitc1608e664b37492af3a56d60dc4cba309eb4e99f
tree6f68c470ef9d6d64514f4821dfe083f218b8f003
parentd393f86867ac227f0b07eb70b7ffc7decbb286fa
parent36359649b42e38e3046e2b8fd02a530c28b77531
upstream merge
Merge remote-tracking branch 'remotes/origin/upstream'

Conflicts:
ChangeLog

Change-Id: Ibbc9edff80b75a0e3d76bfdfc0e9d0b8d44b4258
packaging/edje.spec
src/bin/edje_cc.c
src/bin/edje_cc_handlers.c
src/lib/Edje.h
src/lib/edje_calc.c
src/lib/edje_entry.c
src/lib/edje_multisense.c
src/lib/edje_private.h
src/lib/edje_util.c