From: David Goulet <david.goulet@polymtl.ca>
Date: Wed, 30 Nov 2011 21:35:37 +0000 (-0500)
Subject: Merge branch 'master' of git://git.lttng.org/lttng-tools
X-Git-Tag: v2.0-pre15~51
X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=commitdiff_plain;h=9fdb49d8eac3ff67f553743fb8ce0edee14c3ab6

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

9fdb49d8eac3ff67f553743fb8ce0edee14c3ab6