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)
Change-Id: Ia71f6f676bc12092565c131cf162dff38a66e4d5


Trivial merge