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


Trivial merge