Merge remote-tracking branch 'origin/tizen' into devel/new_mesh 62/39562/1
authorFrancisco Santos <f1.santos@samsung.com>
Mon, 18 May 2015 16:47:03 +0000 (17:47 +0100)
committerFrancisco Santos <f1.santos@samsung.com>
Mon, 18 May 2015 18:26:14 +0000 (19:26 +0100)
Change-Id: I7a43438cd1bff11bcd1093e147432246a758084e


Trivial merge