[dali_1.0.21] Merge branch 'tizen' 81/31881/1
authorNick Holland <nick.holland@partner.samsung.com>
Thu, 11 Dec 2014 15:03:09 +0000 (15:03 +0000)
committerNick Holland <nick.holland@partner.samsung.com>
Thu, 11 Dec 2014 15:03:09 +0000 (15:03 +0000)
Change-Id: I9badf998b46a795a9d5aaade939482e2c142bc15


Trivial merge