From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Thu, 6 Sep 2012 21:43:02 +0000 (-0400)
Subject: Merge branch 'master' into bindings/python
X-Git-Tag: v1.2.0-rc1~90
X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=commitdiff_plain;h=bb919dd077169b5ee049ba3fc82f8555648cb22e

Merge branch 'master' into bindings/python
---

bb919dd077169b5ee049ba3fc82f8555648cb22e