From: Alexandre Montplaisir <alexmonthy@voxpopuli.im>
Date: Tue, 3 Sep 2013 17:41:13 +0000 (-0400)
Subject: Merge branch 'master' into lttng-luna
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=be48c4ff9542b07c8e8d98c9f8a432a73b976131;p=deliverable%2Ftracecompass.git

Merge branch 'master' into lttng-luna

Fixes a build error with the previous -luna head.
---

be48c4ff9542b07c8e8d98c9f8a432a73b976131