Merge branch 'master' into tizen_2.1 2.1b_release accepted/tizen_2.1/20130425.022600 submit/tizen_2.1/20130424.223342
authorhhh.kwon <hhh.kwon@samsung.com>
Wed, 24 Apr 2013 06:30:55 +0000 (15:30 +0900)
committerhhh.kwon <hhh.kwon@samsung.com>
Wed, 24 Apr 2013 06:31:26 +0000 (15:31 +0900)
Change-Id: Icc5a3ab9f969be29995383d1531be1d8fd36592a


Trivial merge