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

Merge branch 'master' into benchmark
---

42b06fc206202e96e260f2870ccc12eeefaac7b1