From: David Goulet <david.goulet@polymtl.ca>
Date: Tue, 6 Dec 2011 19:33:02 +0000 (-0500)
Subject: Merge branch 'master'
X-Git-Tag: v2.0-pre15~31
X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=commitdiff_plain;h=90192ee7cea425e30bd065576612156dd6cf5608

Merge branch 'master'

Signed-off-by: David Goulet <david.goulet@polymtl.ca>
---

90192ee7cea425e30bd065576612156dd6cf5608