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


Trivial merge