Merge branch 'master' into tizen_2.1 2.1b_release accepted/tizen_2.1/20130425.035238 submit/tizen_2.1/20130424.231243
authorKim Gibyoung <lastkgb.kim@samsung.com>
Tue, 23 Apr 2013 17:50:29 +0000 (02:50 +0900)
committerKim Gibyoung <lastkgb.kim@samsung.com>
Tue, 23 Apr 2013 17:50:35 +0000 (02:50 +0900)
Change-Id: Ib1c7a578005f19363c16b1abf349e8a0d84bb533


Trivial merge