Merge branch 'dev' of 106.109.8.71:/srv/git/dbi into dev
authorVasiliy Ulyanov <v.ulyanov@samsung.com>
Fri, 18 May 2012 08:15:47 +0000 (12:15 +0400)
committerVasiliy Ulyanov <v.ulyanov@samsung.com>
Fri, 18 May 2012 08:15:47 +0000 (12:15 +0400)

Trivial merge