[dali_1.0.11] Merge branch 'tizen' 45/28345/1
authorNick Holland <nick.holland@partner.samsung.com>
Fri, 3 Oct 2014 06:02:18 +0000 (07:02 +0100)
committerNick Holland <nick.holland@partner.samsung.com>
Fri, 3 Oct 2014 06:02:21 +0000 (07:02 +0100)
Change-Id: Ic0755bdcdfe5797697eece62d30aaa5f170d05c3


Trivial merge