[dali_1.1.11] Merge branch 'devel/master' 83/52283/1
authorRichard Huang <r.huang@samsung.com>
Fri, 20 Nov 2015 10:58:37 +0000 (10:58 +0000)
committerRichard Huang <r.huang@samsung.com>
Fri, 20 Nov 2015 10:58:37 +0000 (10:58 +0000)
Change-Id: Ib3c4be4e1a61318df15b8ef0ae78b26ecaccccaa


Trivial merge