Merge "Combine Internal::ProxyObject & Internal::Object" into tizen
authorKimmo Hoikka <kimmo.hoikka@samsung.com>
Mon, 23 Feb 2015 11:48:48 +0000 (03:48 -0800)
committerGerrit Code Review <gerrit@review.vlan103.tizen.org>
Mon, 23 Feb 2015 11:48:48 +0000 (03:48 -0800)

Trivial merge