Merge branch 'master' into tizen_2.1
authorKim Gibyoung <lastkgb.kim@samsung.com>
Fri, 3 May 2013 10:37:34 +0000 (19:37 +0900)
committerKim Gibyoung <lastkgb.kim@samsung.com>
Fri, 3 May 2013 10:37:38 +0000 (19:37 +0900)
Change-Id: I0eebca9bc5097e64a1cb2862f468f805562efe9f


Trivial merge