From: David Goulet <david.goulet@polymtl.ca>
Date: Thu, 1 Sep 2011 20:46:57 +0000 (-0400)
Subject: Merge branch 'master' into benchmark
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=904ebd226416bbf7b86e921d19ba9858ea056ce0;p=lttng-tools.git

Merge branch 'master' into benchmark
---

904ebd226416bbf7b86e921d19ba9858ea056ce0