Merge branch 'dev' of 106.109.8.71:/srv/git/dbi into dev
authorVitaliy Cherepanov <v.cherepanov@samsung.com>
Thu, 16 Aug 2012 07:55:37 +0000 (11:55 +0400)
committerVitaliy Cherepanov <v.cherepanov@samsung.com>
Thu, 16 Aug 2012 07:55:37 +0000 (11:55 +0400)
Conflicts:
src/modules/driver/us_proc_inst.c


Trivial merge