Merge branch 'tizen_2.1'
authorJin Yoon <jinny.yoon@samsung.com>
Sat, 20 Apr 2013 11:41:30 +0000 (20:41 +0900)
committerJin Yoon <jinny.yoon@samsung.com>
Sat, 20 Apr 2013 11:41:30 +0000 (20:41 +0900)

Trivial merge