Merge branch 'master' into tizen_2.1 tizen_2.1 2.1b_release accepted/tizen/20130520.100833 accepted/tizen_2.1/20130425.035532 submit/tizen/20130517.044730 submit/tizen_2.1/20130424.230634
authorSeungyoun Ju <sy39.ju@samsung.com>
Wed, 10 Apr 2013 11:43:12 +0000 (20:43 +0900)
committerSeungyoun Ju <sy39.ju@samsung.com>
Wed, 10 Apr 2013 11:43:15 +0000 (20:43 +0900)
Change-Id: Ie05ae4432acdb310e7183ba2b4d24a16f08ea5e2


Trivial merge