Merge branch 'dev' of 106.109.8.71:/srv/git/dbi into dev
authorVasiliy Ulyanov <v.ulyanov@samsung.com>
Wed, 13 Feb 2013 13:34:49 +0000 (17:34 +0400)
committerVasiliy Ulyanov <v.ulyanov@samsung.com>
Wed, 13 Feb 2013 13:34:49 +0000 (17:34 +0400)

Trivial merge