From: David Goulet <david.goulet@polymtl.ca>
Date: Wed, 7 Sep 2011 16:27:13 +0000 (-0400)
Subject: Merge branch 'master' of git://git.lttng.org/lttng-tools
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=6290736119ffdb12baf52080a6b79a81e449b229;p=lttng-tools.git

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

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

6290736119ffdb12baf52080a6b79a81e449b229