merge from tizen branch 95/21295/1
authorwoojin <woojin2.jung@samsung.com>
Sat, 17 May 2014 17:59:13 +0000 (02:59 +0900)
committerwoojin <woojin2.jung@samsung.com>
Sat, 17 May 2014 17:59:13 +0000 (02:59 +0900)
Change-Id: Ic0ab29d9c10b7dfae4ba0b398fa71967baf30a77


Trivial merge