From: David Goulet <david.goulet@polymtl.ca>
Date: Fri, 26 Aug 2011 20:20:03 +0000 (-0400)
Subject: Merge branch 'master' of git://git.lttng.org/lttng-tools
X-Git-Tag: v2.0-pre13~19
X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=commitdiff_plain;h=ef805c1d5319ddce9777a7b78cbbaf595a7981e2

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

ef805c1d5319ddce9777a7b78cbbaf595a7981e2