From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Fri, 24 Feb 2012 01:16:12 +0000 (-0500)
Subject: Merge branch 'master' into dev
X-Git-Tag: v2.1.0-rc1~97^2~8
X-Git-Url: http://git.lttng.org/?a=commitdiff_plain;h=a2adb105d815cfbcf9bf8f870f2f72f79a319138;p=lttng-ust.git

Merge branch 'master' into dev
---

a2adb105d815cfbcf9bf8f870f2f72f79a319138