From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Tue, 16 Oct 2012 00:56:19 +0000 (-0400)
Subject: Merge branch 'master' into ust/callsite
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=6d3ba465e3586c3357c71f2421da4271971eee70;p=lttng-ust.git

Merge branch 'master' into ust/callsite

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
---

6d3ba465e3586c3357c71f2421da4271971eee70