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


Trivial merge