Merge branch 'dev' of 106.109.8.71:/srv/git/dbi into dev
authorVasiliy Ulyanov <v.ulyanov@samsung.com>
Mon, 4 Mar 2013 05:38:04 +0000 (09:38 +0400)
committerVasiliy Ulyanov <v.ulyanov@samsung.com>
Mon, 4 Mar 2013 05:38:04 +0000 (09:38 +0400)

Trivial merge