Merge branch 'tizen' into devel/new_mesh 95/37595/2
authorDavid Steele <david.steele@partner.samsung.com>
Tue, 31 Mar 2015 15:03:54 +0000 (16:03 +0100)
committerDavid Steele <david.steele@partner.samsung.com>
Tue, 31 Mar 2015 16:03:45 +0000 (17:03 +0100)
Change-Id: I12978fe6e331f545fbdf7d9ba045a183d0ae1376


Trivial merge