Merge branch 'master' into benchmark

author David Goulet <david.goulet@polymtl.ca>

Mon, 3 Oct 2011 14:28:19 +0000 (10:28 -0400)

committer David Goulet <david.goulet@polymtl.ca>

Mon, 3 Oct 2011 14:28:19 +0000 (10:28 -0400)
author David Goulet <david.goulet@polymtl.ca>
Mon, 3 Oct 2011 14:28:19 +0000 (10:28 -0400)
committer David Goulet <david.goulet@polymtl.ca>
Mon, 3 Oct 2011 14:28:19 +0000 (10:28 -0400)
diff --cc configure.ac
Simple merge
diff --cc ltt-sessiond/main.c
Simple merge
author	David Goulet <david.goulet@polymtl.ca>
	Mon, 3 Oct 2011 14:28:19 +0000 (10:28 -0400)
committer	David Goulet <david.goulet@polymtl.ca>
	Mon, 3 Oct 2011 14:28:19 +0000 (10:28 -0400)
		1	2
configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history
ltt-sessiond/main.c	patch \|	diff1 \|	diff2 \|	blob \| history