From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Sat, 11 Jun 2011 17:19:13 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.lttng.org/home/git/lttng-modules
X-Git-Tag: v2.0-pre1~55
X-Git-Url: http://git.lttng.org/?p=lttng-modules.git;a=commitdiff_plain;h=d01202ff1f043dd04f62ab77aacea3c26cb65eb3

Merge branch 'master' of ssh://git.lttng.org/home/git/lttng-modules
---

d01202ff1f043dd04f62ab77aacea3c26cb65eb3