Merge branch 'dev' of ssh://106.109.8.71/srv/git/dbi into dev
authorNikita Kalyazin <n.kalyazin@samsung.com>
Wed, 27 Jun 2012 16:11:00 +0000 (20:11 +0400)
committerNikita Kalyazin <n.kalyazin@samsung.com>
Wed, 27 Jun 2012 16:11:00 +0000 (20:11 +0400)

Trivial merge