From: David Goulet <david.goulet@polymtl.ca>
Date: Fri, 16 Sep 2011 21:20:34 +0000 (-0400)
Subject: Fix renaming during merge
X-Git-Url: http://git.lttng.org./?a=commitdiff_plain;h=8915fb60ff20357b2fa21891e57aa46d83fd3d65;hp=8915fb60ff20357b2fa21891e57aa46d83fd3d65;p=lttng-tools.git

Fix renaming during merge

Signed-off-by: David Goulet <david.goulet@polymtl.ca>
---