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

Merge branch 'master' into benchmark
---

01d92d2f4d254089531424e50f8e8fd9226dd5d6