From: David Goulet <david.goulet@polymtl.ca>
Date: Thu, 3 Nov 2011 15:39:31 +0000 (-0400)
Subject: Merge master branch
X-Git-Url: http://git.lttng.org./?a=commitdiff_plain;h=b3342c3941acee14b4ca1e13e593411ca035165c;hp=b3342c3941acee14b4ca1e13e593411ca035165c;p=lttng-tools.git

Merge master branch

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