From: David Goulet <dgoulet@efficios.com>
Date: Fri, 20 Apr 2012 14:39:07 +0000 (-0400)
Subject: Merge branch 'master' into benchmark
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=510e883874aaf7011e48cd2b638760acb59c6930;p=lttng-tools.git

Merge branch 'master' into benchmark

Signed-off-by: David Goulet <dgoulet@efficios.com>
---

510e883874aaf7011e48cd2b638760acb59c6930