Merge "fixed bug (N_SE-40366/P130607-2431)" into tizen_2.2