From: David Goulet <david.goulet@polymtl.ca>
Date: Wed, 24 Aug 2011 13:15:28 +0000 (-0400)
Subject: Merge branch 'master' into benchmark
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=61b14d7a65be7f27bb91b4797839879bcad89586;p=lttng-tools.git

Merge branch 'master' into benchmark
---

61b14d7a65be7f27bb91b4797839879bcad89586