From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Thu, 23 Feb 2012 22:29:04 +0000 (-0500)
Subject: Merge branch 'master' into dev
X-Git-Tag: v2.1.0-rc1~97^2~9
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=c993aa602df5d770ea1da811c4f7f643dde1ed34;p=lttng-ust.git

Merge branch 'master' into dev
---

c993aa602df5d770ea1da811c4f7f643dde1ed34