From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Tue, 6 Mar 2012 23:10:59 +0000 (-0500)
Subject: Merge branch 'master' into dev
X-Git-Tag: v2.1.0-rc1~97^2
X-Git-Url: http://git.liburcu.org/?p=lttng-ust.git;a=commitdiff_plain;h=refs%2Fheads%2Fdev

Merge branch 'master' into dev
---

49365f4b706194cafe75d8b759554bf9de743c1d