Merge branch 'master' into memleak-finder

diff --combined .gitignore
index 96a1ab140c43aa9745d77e1800c2c763a10a6723,d8c993ef52e2a596d458da250770c9f014c4e58f..5d1e2ffa03204d652d980477e1eca9b4da55b274
--- 1/.gitignore
--- 2/.gitignore
+++ b/.gitignore
@@@ -15,6 -15,7 +15,7 @@@ Makefile.i
  *.info
  *.bz2
  *.tar
+ .dirstamp
  configure
  aclocal.m4
  autom4te.cache/
@@@ -45,11 -46,10 +46,12 @@@ src/lib/lttng-ctl/filter/filter-parser.
  extras/bindings/swig/python/lttng.i
  extras/bindings/swig/python/lttng.py
  extras/bindings/swig/python/lttng_wrap.c
+ extras/core-handler/crash
  
  .checkpatch.conf
  
 +!memleak/Makefile
 +
  # Tests
  tests/unit/test_kernel_data
  tests/unit/test_session
@@@ -75,5 -75,6 +77,6 @@@ tests/regression/ust/exit-fast/exit-fas
  tests/regression/ust/fork/fork
  tests/regression/ust/fork/fork2
  tests/regression/ust/libc-wrapper/prog
+ tests/utils/testapp/gen-ust-nevents/gen-ust-nevents
  
  benchmark/