From: Mike McCormack <mj.mccormack@samsung.com>
Date: Wed, 5 Oct 2011 00:36:12 +0000 (+0900)
Subject: Merge branch 'upstream'
X-Git-Tag: 2.0_alpha~47
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=85c50fb4e19702953f7a6fe813b0ee353ca44065;p=framework%2Fuifw%2Feet.git

Merge branch 'upstream'
---

85c50fb4e19702953f7a6fe813b0ee353ca44065