[dali_1.0.33] Merge branch 'tizen' 27/36727/1
authorNick Holland <nick.holland@partner.samsung.com>
Thu, 12 Mar 2015 09:23:35 +0000 (09:23 +0000)
committerNick Holland <nick.holland@partner.samsung.com>
Thu, 12 Mar 2015 09:23:35 +0000 (09:23 +0000)
Change-Id: Ic58d909d660f8809a06af60c13a67315036c9f8e


Trivial merge