Merge branch 'tizen_2.1' into tizen_2.2
authorDongjin Choi <milkelf.choi@samsung.com>
Thu, 6 Jun 2013 14:35:22 +0000 (23:35 +0900)
committerDongjin Choi <milkelf.choi@samsung.com>
Thu, 6 Jun 2013 14:35:57 +0000 (23:35 +0900)

Trivial merge