From: Pierre-Marc Fournier <pierre-marc.fournier@polymtl.ca>
Date: Mon, 26 Apr 2010 14:13:15 +0000 (-0400)
Subject: Merge branch 'master' of git://git.dorsal.polymtl.ca/git/liblttngtrace
X-Git-Tag: 0.12.32~14
X-Git-Url: http://git.liburcu.org/?p=lttv.git;a=commitdiff_plain;h=9bf3752a47cedeb96104e465e94ccea90416707f

Merge branch 'master' of git://git.dorsal.polymtl.ca/git/liblttngtrace
---

9bf3752a47cedeb96104e465e94ccea90416707f