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

Trivial merge