Patch by Jaehun Lim <ljaehun.lim@samsung.com> on 2011-07-14