Merge branch 'master' into benchmark

author David Goulet <dgoulet@efficios.com>

Mon, 16 Jan 2012 15:43:11 +0000 (10:43 -0500)

committer David Goulet <dgoulet@efficios.com>

Mon, 16 Jan 2012 15:43:11 +0000 (10:43 -0500)
author David Goulet <dgoulet@efficios.com>
Mon, 16 Jan 2012 15:43:11 +0000 (10:43 -0500)
committer David Goulet <dgoulet@efficios.com>
Mon, 16 Jan 2012 15:43:11 +0000 (10:43 -0500)
diff --cc configure.ac
Simple merge
diff --cc lttng-sessiond/main.c
Simple merge
author	David Goulet <dgoulet@efficios.com>
	Mon, 16 Jan 2012 15:43:11 +0000 (10:43 -0500)
committer	David Goulet <dgoulet@efficios.com>
	Mon, 16 Jan 2012 15:43:11 +0000 (10:43 -0500)
		1	2
configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history
lttng-sessiond/main.c	patch \|	diff1 \|	diff2 \|	blob \| history