Merge branch 'tizen_2.1' into tizen_2.2
authorJin Yoon <jinny.yoon@samsung.com>
Tue, 11 Jun 2013 09:12:24 +0000 (18:12 +0900)
committerJin Yoon <jinny.yoon@samsung.com>
Tue, 11 Jun 2013 09:12:24 +0000 (18:12 +0900)

Trivial merge