Merge branch 'master' into tizen
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Wed, 11 Jun 2014 07:46:30 +0000 (08:46 +0100)
committerAdeel Kazmi <adeel.kazmi@samsung.com>
Wed, 11 Jun 2014 07:46:30 +0000 (08:46 +0100)

Trivial merge