Merge remote branch 'origin/upstream'
authorJaehwan Kim <jae.hwan.kim@samsung.com>
Tue, 6 Dec 2011 05:05:28 +0000 (14:05 +0900)
committerJaehwan Kim <jae.hwan.kim@samsung.com>
Tue, 6 Dec 2011 05:05:28 +0000 (14:05 +0900)
commit52ecd47bc3afed7e693d5faa672788b849681bac
tree28c5487ab3157b0a50ddc319acd214dec01f9b84
parent81d3371cbc7c8d757a99f20fcef6243b8896c73b
parented4699cc5bc42f1a01297ffeb4167e06b967980e
Merge remote branch 'origin/upstream'

Conflicts:
po/cs.po
po/de.po
po/fr.po
po/it.po
po/nl.po
po/pt.po
po/sl.po
po/cs.po
src/lib/ecore_x/Ecore_X.h
src/lib/ecore_x/xlib/ecore_x_atoms.c
src/lib/ecore_x/xlib/ecore_x_e.c