Merge branch 'master' into tizen_2.1 tizen_2.1 accepted/tizen/20130530.164440 accepted/tizen_2.1/20130520.093235 submit/tizen/20130529.220755 submit/tizen_2.1/20130516.133723
authorKim Gibyoung <lastkgb.kim@samsung.com>
Thu, 16 May 2013 09:16:35 +0000 (18:16 +0900)
committerKim Gibyoung <lastkgb.kim@samsung.com>
Thu, 16 May 2013 09:16:44 +0000 (18:16 +0900)
Change-Id: I5c22adffd488c6a31aae960de9833c3cc7e02acc


Trivial merge