From: David Goulet <david.goulet@polymtl.ca>
Date: Tue, 29 Nov 2011 18:44:47 +0000 (-0500)
Subject: Merge branch 'master' of git://git.lttng.org/lttng-tools
X-Git-Tag: v2.0-pre15~69
X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=commitdiff_plain;h=ce4500b0db50259c41d9f148ae3e8ecb2030683a

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

ce4500b0db50259c41d9f148ae3e8ecb2030683a