From: David Goulet <david.goulet@polymtl.ca>
Date: Tue, 4 Oct 2011 21:54:45 +0000 (-0400)
Subject: Merge branch 'master' into benchmark
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=8d5bb86ea2e1a863a5d0dd91249f32e1fcd29fd6;p=lttng-tools.git

Merge branch 'master' into benchmark
---

8d5bb86ea2e1a863a5d0dd91249f32e1fcd29fd6