Merge branch 'dev' of 106.109.8.71:/srv/git/dbi into dev
authorVitaliy Cherepanov <v.cherepanov@samsung.com>
Thu, 25 Oct 2012 09:42:14 +0000 (13:42 +0400)
committerVitaliy Cherepanov <v.cherepanov@samsung.com>
Thu, 25 Oct 2012 09:42:14 +0000 (13:42 +0400)
Conflicts:
src/probes/probes.def


Trivial merge