From: David Goulet <dgoulet@efficios.com>
Date: Fri, 13 Jan 2012 15:10:58 +0000 (-0500)
Subject: Merge branch 'master' of git://git.lttng.org/lttng-tools
X-Git-Tag: v2.0-pre17~22
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=008dd0fe872d71d154867d25579b58a0a204d93d;p=lttng-tools.git

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

008dd0fe872d71d154867d25579b58a0a204d93d