Migration with svn version @65618
authorJaehwan Kim <jae.hwan.kim@samsung.com>
Mon, 28 Nov 2011 02:26:39 +0000 (11:26 +0900)
committerJaehwan Kim <jae.hwan.kim@samsung.com>
Tue, 29 Nov 2011 04:51:13 +0000 (13:51 +0900)
Merge remote branch 'origin/upstream'

Conflicts:
po/el.po

1  2 
src/lib/ecore/ecore_thread.c
src/lib/ecore_evas/ecore_evas_x.c

Simple merge
Simple merge