From: David Goulet <david.goulet@polymtl.ca>
Date: Mon, 14 Nov 2011 17:11:17 +0000 (-0500)
Subject: Merge branch 'master' of git://git.lttng.org/lttng-tools
X-Git-Tag: v2.0-pre15~118
X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=commitdiff_plain;h=c70c0ca0e8e46b29376d77b5b4483891cb33679d

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

c70c0ca0e8e46b29376d77b5b4483891cb33679d