From: David Goulet <dgoulet@efficios.com>
Date: Fri, 2 Mar 2012 20:18:33 +0000 (-0500)
Subject: Merge branch 'master' of git://git.lttng.org/lttng-tools
X-Git-Tag: v2.0.0-rc3~18
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=a186a15913c34e8adc83ea71565d3b0eec296774;p=lttng-tools.git

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

a186a15913c34e8adc83ea71565d3b0eec296774