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

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

976731c81935b744ae0fdf4044d1e6f7f9c1e0e8