merge from tizen 67/21267/1
authorgreatim <jaewon81.lim@samsung.com>
Fri, 16 May 2014 13:14:50 +0000 (22:14 +0900)
committergreatim <jaewon81.lim@samsung.com>
Fri, 16 May 2014 13:14:50 +0000 (22:14 +0900)
commite00ce7d35bd07346c439b2e4b2903cd0f55d7a8e
treec918f0542deb308598145285417165446398036a
parentad596f77c58c9c8184e14e63dd61f0c15091c4bc
parent0d4f7ace291e225840065dca559e7565556f5745
merge from tizen

Change-Id: Ia71f6f676bc12092565c131cf162dff38a66e4d5