Merge remote-tracking branch 'origin/upstream'
authorMike McCormack <mj.mccormack@samsung.com>
Wed, 16 Nov 2011 23:33:48 +0000 (08:33 +0900)
committerMike McCormack <mj.mccormack@samsung.com>
Wed, 16 Nov 2011 23:33:48 +0000 (08:33 +0900)
commitfd8f6878a709dce56bd1e6666896a959a7dfad07
tree3d26787c2659798474e4fd7a6a07e60bfa4a6569
parent07a6cd47cb59065dc855495af2485d3b997830da
parent3721232d40a745c8e468cc8be61ee0afed32b942
Merge remote-tracking branch 'origin/upstream'

Conflicts:
po/cs.po
po/de.po
po/el.po
po/fr.po
po/it.po
po/nl.po
po/pt.po
po/sl.po
src/lib/ecore_con/ecore_con_url.c
src/lib/ecore/ecore_thread.c
src/lib/ecore_con/ecore_con_url.c
src/lib/ecore_evas/ecore_evas_x.c