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)
commit0f1b5a19bff237e63a41d6062cbd2145843929f9
tree0898606171c463b3f9140f3d7434d9e2cb294005
parentc6773fab4731114ca5b61a78102665e06184f853
parent62789f714ab188ca74213e1a238d43e0e8245e8d
Migration with svn version @65618
Merge remote branch 'origin/upstream'

Conflicts:
po/el.po
src/lib/ecore/ecore_thread.c
src/lib/ecore_evas/ecore_evas_x.c