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


Trivial merge