Merge branch 'dev' into plt_branch
authorAlexander Aksenov <a.aksenov@samsung.com>
Fri, 2 Nov 2012 14:59:12 +0000 (18:59 +0400)
committerAlexander Aksenov <a.aksenov@samsung.com>
Fri, 2 Nov 2012 14:59:12 +0000 (18:59 +0400)

Trivial merge