Merge branch 'tizen_2.3_develop' into tizen_2.3_multi
authorSooyoung Ha <yoosah.ha@samsung.com>
Wed, 24 Jun 2015 05:21:50 +0000 (14:21 +0900)
committerSooyoung Ha <yoosah.ha@samsung.com>
Wed, 24 Jun 2015 05:22:24 +0000 (14:22 +0900)
Change-ID: I9d6985f34ad95782c13674e3bff24097c1b6e770
Signed-off-by: Sooyoung Ha <yoosah.ha@samsung.com>

Trivial merge