[dali_1.0.17] Merge branch 'tizen' 69/30269/1
authorNick Holland <nick.holland@partner.samsung.com>
Thu, 13 Nov 2014 11:37:08 +0000 (11:37 +0000)
committerNick Holland <nick.holland@partner.samsung.com>
Thu, 13 Nov 2014 11:37:12 +0000 (11:37 +0000)
Change-Id: I5fe6b0ab05561b913733db15e4857b99f16573d7


Trivial merge