[dali_1.0.17] Merge branch 'tizen' 68/30268/1
authorNick Holland <nick.holland@partner.samsung.com>
Thu, 13 Nov 2014 11:36:20 +0000 (11:36 +0000)
committerNick Holland <nick.holland@partner.samsung.com>
Thu, 13 Nov 2014 11:36:27 +0000 (11:36 +0000)
Change-Id: I4b2d1135980b2eba55404b4414dc07996157e62e


Trivial merge