Merge branch 'tizen_2.3' into tizen_2.4
authorKyuho Jo <kyuho.jo@samsung.com>
Fri, 16 Jan 2015 12:24:37 +0000 (21:24 +0900)
committerKyuho Jo <kyuho.jo@samsung.com>
Fri, 16 Jan 2015 12:24:37 +0000 (21:24 +0900)
Change-Id: Ife654f48c57975248839d8a62eace8158e1222ba
Signed-off-by: Kyuho Jo <kyuho.jo@samsung.com>

Trivial merge