Migration with svn revision 66979
authorJaehwan Kim <jae.hwan.kim@samsung.com>
Mon, 9 Jan 2012 02:51:13 +0000 (11:51 +0900)
committerJaehwan Kim <jae.hwan.kim@samsung.com>
Mon, 16 Jan 2012 08:40:30 +0000 (17:40 +0900)
commitcc9ff5223cc038dd262151828c587bd4f8a84785
tree3c26cf458b5596882dd2d15a5b42a3b5a49ea4d3
parentf7ba3ae6d0ed94f87fa01f6ded1615ccab5ebb7a
parent0e6234f2e72d6840a1b3084883176e197eb916b0
Migration with svn revision 66979
Merge remote branch 'origin/upstream'

Conflicts:
src/lib/edje_calc.c
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