From: David Goulet <dgoulet@efficios.com>
Date: Thu, 1 Mar 2012 18:04:18 +0000 (-0500)
Subject: Merge branch 'master' into compat-freebsd
X-Git-Tag: v2.0.0-rc3~20
X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=commitdiff_plain;h=1af0e2e4d4a770e32f4fc169122b0c338bd799f6

Merge branch 'master' into compat-freebsd
---

1af0e2e4d4a770e32f4fc169122b0c338bd799f6