Merge latest codes from tizen 2.3 branch 35/39135/1
authorKyuho Jo <kyuho.jo@samsung.com>
Mon, 13 Apr 2015 04:00:54 +0000 (13:00 +0900)
committerKyuho Jo <kyuho.jo@samsung.com>
Mon, 13 Apr 2015 04:00:54 +0000 (13:00 +0900)
Change-Id: I1403937cd097b3b8101f6a8966c586fe28ff4636
Signed-off-by: Kyuho Jo <kyuho.jo@samsung.com>

Trivial merge