From: David Goulet <david.goulet@polymtl.ca>
Date: Thu, 15 Sep 2011 15:34:32 +0000 (-0400)
Subject: Merge branch 'master' into benchmark
X-Git-Url: http://git.lttng.org./?a=commitdiff_plain;h=dab4c8a1edbae6360d94bda657ee545ec24699b4;hp=dab4c8a1edbae6360d94bda657ee545ec24699b4;p=lttng-tools.git

Merge branch 'master' into benchmark

Signed-off-by: David Goulet <david.goulet@polymtl.ca>
---