Merge "fixed dependancy issue" into tizen_2.1