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


Trivial merge