Merge branch 'dev' of ssh://106.109.8.71/srv/git/dbi_new_build into dev
authorNikita Kalyazin <n.kalyazin@samsung.com>
Fri, 8 Jul 2011 09:23:41 +0000 (13:23 +0400)
committerNikita Kalyazin <n.kalyazin@samsung.com>
Fri, 8 Jul 2011 09:23:41 +0000 (13:23 +0400)

Trivial merge