From: David Goulet <david.goulet@polymtl.ca>
Date: Mon, 26 Sep 2011 17:21:30 +0000 (-0400)
Subject: Merge branch 'master' into benchmark
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=4c13f73f92c1cfdab179575450228f482a02135e;p=lttng-tools.git

Merge branch 'master' into benchmark
---

4c13f73f92c1cfdab179575450228f482a02135e