Merge branch 'master' of ssh://106.109.8.71/srv/git/dbi_new_build
authorNikita Kalyazin <n.kalyazin@samsung.com>
Tue, 17 Aug 2010 11:07:51 +0000 (15:07 +0400)
committerNikita Kalyazin <n.kalyazin@samsung.com>
Tue, 17 Aug 2010 11:07:51 +0000 (15:07 +0400)
Conflicts:
src/ICL_Parser/Makefile


Trivial merge