Merge remote-tracking branch 'origin/upstream'
authorMike McCormack <mj.mccormack@samsung.com>
Thu, 3 Nov 2011 05:13:21 +0000 (14:13 +0900)
committerMike McCormack <mj.mccormack@samsung.com>
Thu, 3 Nov 2011 05:16:13 +0000 (14:16 +0900)
commitc515216a6da7ad9aea5a2a924a0ff21a445c8847
treec3d1a32cc982ae36e90c8e18a6e817234ac1765c
parent343f38c64ee1a11058f8507322c7e81e2bafe125
parent9f16e6055e3dafef45e7e3ef7285709fc10ba952
Merge remote-tracking branch 'origin/upstream'

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