[dali_1.0.11] Merge branch 'tizen' 46/28346/1
authorNick Holland <nick.holland@partner.samsung.com>
Fri, 3 Oct 2014 06:04:18 +0000 (07:04 +0100)
committerNick Holland <nick.holland@partner.samsung.com>
Fri, 3 Oct 2014 06:04:37 +0000 (07:04 +0100)
Change-Id: Ia6bb5ac66faef23258887fbda9e96c0c64f0443f


Trivial merge