[dali_1.0.1] Merge branch 'tizen' 82/24982/1
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Thu, 24 Jul 2014 14:15:42 +0000 (15:15 +0100)
committerAdeel Kazmi <adeel.kazmi@samsung.com>
Thu, 24 Jul 2014 14:15:48 +0000 (15:15 +0100)
Change-Id: I612f5ee42293c46a3ea36ef21f1ca0dba97062d1


Trivial merge