From: David Goulet <dgoulet@efficios.com>
Date: Thu, 2 Feb 2012 15:26:45 +0000 (-0500)
Subject: Merge branch 'master' of git://git.lttng.org/lttng-tools
X-Git-Tag: v2.0-pre19~8
X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=commitdiff_plain;h=baa81d3ac6e60bf3caf261342e10a7f85e87e23a

Merge branch 'master' of git://git.lttng.org/lttng-tools
---

baa81d3ac6e60bf3caf261342e10a7f85e87e23a