Merge branch 'master' into tizen
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Tue, 10 Jun 2014 14:52:59 +0000 (15:52 +0100)
committerAdeel Kazmi <adeel.kazmi@samsung.com>
Tue, 10 Jun 2014 14:52:59 +0000 (15:52 +0100)

Trivial merge