Merge remote-tracking branch 'origin/upstream'
authorJeonghyun Yun <jh0506.yun@samsung.com>
Wed, 29 Feb 2012 07:01:51 +0000 (02:01 -0500)
committerJeonghyun Yun <jh0506.yun@samsung.com>
Wed, 29 Feb 2012 07:01:51 +0000 (02:01 -0500)
commite81d560835373d9d1c77cb448857756bd11717ef
tree683c651073188dc3e5322db87f45c15f6ba61354
parent105936c0494c7dec0ffb9eb8826cea693c14e545
parent8f453a84a1ba98e6f28427e266d5fcd5b8cf9fa4
Merge remote-tracking branch 'origin/upstream'

Conflicts:
src/lib/Edje.h
src/lib/edje_entry.c
src/lib/edje_private.h
src/lib/edje_util.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