Merge branch 'master' into tizen_2.0
authorNam KwanWoo <kw46.nam@samsung.com>
Thu, 17 Jan 2013 10:05:00 +0000 (19:05 +0900)
committerNam KwanWoo <kw46.nam@samsung.com>
Thu, 17 Jan 2013 10:05:04 +0000 (19:05 +0900)
Change-Id: I2c1e796477485d5b91ac420d6adf6301371c33e8


Trivial merge