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


Trivial merge