Merge "Changes following "Remove Geometry scene object"" into devel/master
authorPaul Wisbey <p.wisbey@samsung.com>
Tue, 26 Apr 2016 13:00:26 +0000 (06:00 -0700)
committerGerrit Code Review <gerrit@review.vlan103.tizen.org>
Tue, 26 Apr 2016 13:00:27 +0000 (06:00 -0700)

Trivial merge