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


Trivial merge