Merge "fix memory leak" into tizen_2.1