From: Mike McCormack <mj.mccormack@samsung.com>
Date: Wed, 16 Nov 2011 23:33:48 +0000 (+0900)
Subject: Merge remote-tracking branch 'origin/upstream'
X-Git-Tag: 2.0_alpha~122
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=fd8f6878a709dce56bd1e6666896a959a7dfad07;p=framework%2Fuifw%2Fecore.git

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
---

fd8f6878a709dce56bd1e6666896a959a7dfad07