Merge branch 'master' into tizen_2.1 2.1b_release accepted/tizen_2.1/20130425.023229 submit/tizen_2.1/20130424.223833
authorhhh.kwon <hhh.kwon@samsung.com>
Thu, 18 Apr 2013 14:42:07 +0000 (23:42 +0900)
committerhhh.kwon <hhh.kwon@samsung.com>
Thu, 18 Apr 2013 14:42:11 +0000 (23:42 +0900)

Trivial merge