Migration with svn revision 66972
authorJaehwan Kim <jae.hwan.kim@samsung.com>
Mon, 9 Jan 2012 02:29:50 +0000 (11:29 +0900)
committerJaehwan Kim <jae.hwan.kim@samsung.com>
Mon, 16 Jan 2012 08:06:14 +0000 (17:06 +0900)
commitd8aa897070e6510f393a09f91168f5f1bed694af
tree33126976e3d1d9a2991c5edf918767f41061b33c
parent49ef8a4525fdd48d957c3d6f5310d83472b42f0c
parentf1eda20a381d184c077bc14d97ea89eac788050a
Migration with svn revision 66972
Merge remote branch 'origin/upstream'

Conflicts:
.gitignore
src/lib/ecore_con/Ecore_Con.h
src/lib/ecore_con/ecore_con.c
src/lib/ecore_con/ecore_con_private.h
src/lib/ecore_con/ecore_con_socks.c
src/lib/ecore_con/ecore_con_url.c
.gitignore
ecore.spec.in
po/cs.po
src/lib/ecore/ecore_thread.c
src/lib/ecore_con/Ecore_Con.h
src/lib/ecore_con/ecore_con_url.c
src/lib/ecore_evas/ecore_evas_private.h
src/lib/ecore_evas/ecore_evas_x.c
src/lib/ecore_imf/Ecore_IMF.h
src/lib/ecore_x/Ecore_X.h
src/modules/immodules/xim/ecore_imf_xim.c