Merge branch 'mec'
authorAlexey Gerenkov <a.gerenkov@samsung.com>
Thu, 26 Aug 2010 09:18:30 +0000 (13:18 +0400)
committerAlexey Gerenkov <a.gerenkov@samsung.com>
Thu, 26 Aug 2010 09:18:30 +0000 (13:18 +0400)
commit74c1b77fb713378d02573930015f7b69e3281bae
treee05cc295edc5cc146801590ef8c6d664acb512d1
parentee96e75078b82cb5749abce7a4c25103b7e06459
parente624c3702024834c90b4b251a6d207f5b0436298
Merge branch 'mec'

Conflicts:
src/tools/memcheck/heap/Makefile.am
src/tools/memcheck/heap/alloc.cpp
src/tools/memcheck/probes/Makefile