Merge branch 'master' into tizen_2.1 tizen_2.1 accepted/tizen/20130530.164457 submit/tizen/20130529.220750 submit/tizen_2.1/20130514.055159
authorMi-Ju Lee <miju52.lee@samsung.com>
Thu, 2 May 2013 05:33:20 +0000 (14:33 +0900)
committerMi-Ju Lee <miju52.lee@samsung.com>
Thu, 2 May 2013 05:33:33 +0000 (14:33 +0900)
Change-Id: I48e90317e6a46134c11dbde236c5e35dadb233b3


Trivial merge