Merge latest codes from tizen 2.4 branch
authorKyuho Jo <kyuho.jo@samsung.com>
Thu, 9 Apr 2015 01:11:51 +0000 (10:11 +0900)
committerKyuho Jo <kyuho.jo@samsung.com>
Thu, 9 Apr 2015 01:11:51 +0000 (10:11 +0900)
Change-Id: I6aaf20787105713d73e61002a96eb2be3358e20b
Signed-off-by: Kyuho Jo <kyuho.jo@samsung.com>

Trivial merge