From: David Goulet <david.goulet@polymtl.ca>
Date: Wed, 5 Oct 2011 22:43:02 +0000 (-0400)
Subject: Merge branch 'master' into benchmark
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=1980ec5e594098de6e37b4d9d88a75ca014ad4f9;p=lttng-tools.git

Merge branch 'master' into benchmark
---

1980ec5e594098de6e37b4d9d88a75ca014ad4f9