Merge branch 'upstream'
authorMike McCormack <mj.mccormack@samsung.com>
Fri, 7 Oct 2011 02:35:35 +0000 (11:35 +0900)
committerMike McCormack <mj.mccormack@samsung.com>
Fri, 7 Oct 2011 02:35:35 +0000 (11:35 +0900)
commit8167e10cc5f38a86fa0db0be63696f591ca72ae6
treec3726c644483b73453975c8cf307c1a761746fff
parent5fae4ace2cbfc043f6f94f30cfe8fdc656d2551b
parent59e4dcd00af3e26bb980ab29e04e0c280fe7c4b5
Merge branch 'upstream'

Conflicts:
src/lib/ecore_evas/ecore_evas_private.h
src/lib/ecore_evas/ecore_evas_private.h
src/lib/ecore_evas/ecore_evas_x.c