Merge latest codes from tizen 2.3 branch
authorKyuho Jo <kyuho.jo@samsung.com>
Tue, 14 Apr 2015 06:51:50 +0000 (15:51 +0900)
committerKyuho Jo <kyuho.jo@samsung.com>
Tue, 14 Apr 2015 06:51:50 +0000 (15:51 +0900)
Change-Id: I642f20a92f27eee128b28a00e076d9467750383e
Signed-off-by: Kyuho Jo <kyuho.jo@samsung.com>

Trivial merge