Merge branch 'dev' of 106.109.8.71:/srv/git/dbi into new_dpf
authorVyacheslav Cherkashin <v.cherkashin@samsung.com>
Tue, 15 Jan 2013 09:29:54 +0000 (13:29 +0400)
committerVyacheslav Cherkashin <v.cherkashin@samsung.com>
Tue, 15 Jan 2013 09:29:54 +0000 (13:29 +0400)

Trivial merge