Merge branch 'tizen_2.1' into tizen_2.2
authorSung-jae Park <nicesj.park@samsung.com>
Thu, 13 Jun 2013 02:08:13 +0000 (11:08 +0900)
committerSung-jae Park <nicesj.park@samsung.com>
Thu, 13 Jun 2013 02:08:22 +0000 (11:08 +0900)
Change-Id: Ic7b795b2551fc1adaf897a66340dfc635509861c


Trivial merge