Merge branch 'dev' of 106.109.8.71:/srv/git/dbi into dev
authorVasiliy Ulyanov <v.ulyanov@samsung.com>
Wed, 30 Jan 2013 09:44:50 +0000 (13:44 +0400)
committerVasiliy Ulyanov <v.ulyanov@samsung.com>
Wed, 30 Jan 2013 09:44:50 +0000 (13:44 +0400)

Trivial merge