Merge "Preparation for minor version upgrade" into devel/master
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Thu, 4 Aug 2016 16:32:10 +0000 (09:32 -0700)
committerGerrit Code Review <gerrit@review.vlan103.tizen.org>
Thu, 4 Aug 2016 16:32:10 +0000 (09:32 -0700)

Trivial merge