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


Trivial merge