Merge branch 'master' into tizen_2.1 2.1b_release accepted/tizen_2.1/20130425.022829 submit/tizen_2.1/20130424.223629
authorJin Yoon <jinny.yoon@samsung.com>
Mon, 22 Apr 2013 08:21:11 +0000 (17:21 +0900)
committerJin Yoon <jinny.yoon@samsung.com>
Mon, 22 Apr 2013 08:21:11 +0000 (17:21 +0900)

Trivial merge