Merge branch 'devel/master' into tizen_2.4
authorpius.lee <pius.lee@samsung.com>
Thu, 12 Mar 2015 11:11:11 +0000 (20:11 +0900)
committerpius.lee <pius.lee@samsung.com>
Thu, 12 Mar 2015 11:28:24 +0000 (20:28 +0900)
Change-Id: I8a6458124ac9459dd49503ad1b1f503720b51d87


Trivial merge