Merge remote-tracking branch 'origin/upstream'
authorMike McCormack <mj.mccormack@samsung.com>
Wed, 5 Oct 2011 06:54:38 +0000 (15:54 +0900)
committerMike McCormack <mj.mccormack@samsung.com>
Wed, 5 Oct 2011 06:54:38 +0000 (15:54 +0900)
commitea0644f0779f690efe27f370371a48851c33587f
tree00002b0198ef9e9085f8ce1e13f6bb7f4f1f36c8
parentd5343268759729b793e1fb7993599cd3bc089d5b
parenta2f12a582430c79a99baff79d755c51265a1fe3a
Merge remote-tracking branch 'origin/upstream'

Conflicts:
src/lib/ecore_x/xlib/ecore_x_events.c
src/lib/ecore/ecore_thread.c
src/lib/ecore_evas/ecore_evas_x.c
src/lib/ecore_x/Ecore_X.h
src/lib/ecore_x/xlib/ecore_x_e.c
src/lib/ecore_x/xlib/ecore_x_events.c