Merge "Updates required for https://review.tizen.org/gerrit/#/c/41602/" into devel...
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Wed, 17 Jun 2015 11:02:24 +0000 (04:02 -0700)
committerGerrit Code Review <gerrit@review.vlan103.tizen.org>
Wed, 17 Jun 2015 11:02:24 +0000 (04:02 -0700)

Trivial merge