From: David Goulet <david.goulet@polymtl.ca>
Date: Fri, 16 Sep 2011 16:24:47 +0000 (-0400)
Subject: Merge branch 'master' into benchmark
X-Git-Url: http://git.lttng.org./?a=commitdiff_plain;h=065f56f0d0c5fd15650d8cb6191b2bb03d426c08;p=lttng-tools.git

Merge branch 'master' into benchmark
---

065f56f0d0c5fd15650d8cb6191b2bb03d426c08