[dali_1.0.21] Merge branch 'tizen' 78/31878/1
authorNick Holland <nick.holland@partner.samsung.com>
Thu, 11 Dec 2014 15:02:42 +0000 (15:02 +0000)
committerNick Holland <nick.holland@partner.samsung.com>
Thu, 11 Dec 2014 15:02:42 +0000 (15:02 +0000)
Change-Id: I57126741b8a9e031a7e9b038e0967b96c9a3189f


Trivial merge