Merge branch 'dev' of 106.109.8.71:/srv/git/dbi into dev
authorVyacheslav Cherkashin <v.cherkashin@samsung.com>
Thu, 18 Oct 2012 08:29:12 +0000 (12:29 +0400)
committerVyacheslav Cherkashin <v.cherkashin@samsung.com>
Thu, 18 Oct 2012 08:29:12 +0000 (12:29 +0400)
commitcb4b1637ba26faf2041d7f4e58c366c761477086
tree99086ef49df53574bf2c978329d64bc5289ccb3e
parent9a12def3fb39f345a02109f60a21cd7b402da561
parentc5cba70b8be378812d1872852b7d03af8f59102f
Merge branch 'dev' of 106.109.8.71:/srv/git/dbi into dev

Conflicts:
src/modules/driver/us_proc_inst.c
driver/us_proc_inst.c