Merge branch 'master' into tizen_2.1 submit/tizen_2.1/20130514.053222
authorKim Gibyoung <lastkgb.kim@samsung.com>
Fri, 10 May 2013 11:40:18 +0000 (20:40 +0900)
committerKim Gibyoung <lastkgb.kim@samsung.com>
Fri, 10 May 2013 11:41:33 +0000 (20:41 +0900)
Change-Id: I56374d9fa93e4b24601b6224aef8f93afac9de27


Trivial merge