From: User <compudj@freebsd-i386.vm>
Date: Fri, 24 Feb 2012 03:48:56 +0000 (-0500)
Subject: Merge branch 'master' into compat-freebsd
X-Git-Tag: v2.0.0-rc3~27
X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=commitdiff_plain;h=1d76b9222464f9e10128ae867cd56a9317da5d65

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

1d76b9222464f9e10128ae867cd56a9317da5d65