Merge branch 'master' into tizen_2.1 tizen_2.1 2.2_release submit/tizen_2.1/20130514.055329 submit/tizen_2.2/20130714.154842
authorKim Gibyoung <lastkgb.kim@samsung.com>
Fri, 10 May 2013 11:00:02 +0000 (20:00 +0900)
committerKim Gibyoung <lastkgb.kim@samsung.com>
Fri, 10 May 2013 11:00:06 +0000 (20:00 +0900)
Change-Id: I1f5e76ba7c1d8ada5714558146dcb302859441af


Trivial merge