Merge branch 'master' into bindings/python

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>

diff --cc .gitignore
index c60c0e4b00092d6df13395aba313e85cce08953e,2b5af7e28fba1d5b6d6ad67e5812005487a21adf..782da3e9621b8fc665e2206cf626ec48232e40b6
--- 1/.gitignore
--- 2/.gitignore
+++ b/.gitignore
@@@ -1,6 -1,5 +1,6 @@@
- /tests/lib/test-bitfield
- /tests/lib/test-seeks
 +*~
+ /tests/lib/test_bitfield
+ /tests/lib/test_seek
  *.o
  *.a
  *.la

diff --cc Makefile.am
index d28fbc0f78f2e233e172bfc5b774c40eb0ae6011,e5eca77f506b4fcbf0bf7b5e1e379d145115bb91..c3c64e09a01db8623b2ff312645196fbfe54d14c
--- 1/Makefile.am
--- 2/Makefile.am
+++ b/Makefile.am
@@@ -2,7 -2,7 +2,7 @@@ AM_CFLAGS = $(PACKAGE_CFLAGS) -I$(top_s
  
  ACLOCAL_AMFLAGS = -I m4
  
- SUBDIRS = include types lib formats converter bindings tests doc extras
 -SUBDIRS = include types compat lib formats converter tests doc extras
++SUBDIRS = include types compat lib formats converter bindings tests doc extras
  
  dist_doc_DATA = ChangeLog LICENSE mit-license.txt gpl-2.0.txt \
                std-ext-lib.txt

diff --cc configure.ac
index 4563c35c575ae216ac83f63b8b717fff079fa128,58a472d1fac2c2976964ccad603cb96aa53faede..16679b84ae09dd7527b17cac343d1b7f4c8c1ad5
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -141,10 -132,11 +167,13 @@@ AC_CONFIG_FILES(
        lib/Makefile
        lib/prio_heap/Makefile
        include/Makefile
 +      bindings/Makefile
 +      bindings/python/Makefile
        tests/Makefile
+       tests/bin/Makefile
        tests/lib/Makefile
+       tests/utils/Makefile
+       tests/utils/tap/Makefile
        extras/Makefile
        extras/valgrind/Makefile
        babeltrace.pc