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


Trivial merge