Merge branch 'tizen_2.1'
authorJin Yoon <jinny.yoon@samsung.com>
Thu, 18 Apr 2013 04:05:18 +0000 (13:05 +0900)
committerJin Yoon <jinny.yoon@samsung.com>
Thu, 18 Apr 2013 04:05:18 +0000 (13:05 +0900)

Trivial merge