Merge branch 'master' of kovalenko@106.109.8.71:/srv/git/dbi_new_build
authorDmitry Kovalenko <d.kovalenko@samsung.com>
Mon, 27 Sep 2010 05:54:59 +0000 (09:54 +0400)
committerDmitry Kovalenko <d.kovalenko@samsung.com>
Mon, 27 Sep 2010 05:54:59 +0000 (09:54 +0400)
commitac706a135d31282465e1ee55f2286ea3b74f5b75
tree466a816c10000cec7767f1464da216bc2557f95b
parenteb33ea99a6915876f5e721f173eb90b4d8353d26
parentf3b906d1eb1290dabcc0d0eca6a2989e633837ad
Merge branch 'master' of kovalenko@106.109.8.71:/srv/git/dbi_new_build

Conflicts:
scripts/configure_target.sh
src/modules/kprobe/dbi_kprobes_deps.c
src/profile/Makefile.am