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)
commit9246a5d4a996e25d962bda3cbc31b3b015c90214
tree1163c241ef5020ccde7c1ee5cdd20bed7bfb6937
parent1368767e6b5db690c41552c64b4b6c16fc47d8cd
parentb63763d8c6f5914a0f7fbf544063c8a04d06e671
Merge branch 'dev' of 106.109.8.71:/srv/git/dbi into dev

Conflicts:
src/modules/driver/us_proc_inst.c