From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Sun, 20 Jan 2013 17:57:42 +0000 (-0500)
Subject: Merge branch 'master' into bindings/python
X-Git-Tag: v1.2.0-rc1~87
X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=commitdiff_plain;h=f85f806c0bd6b0d2583805d6bdd8d792b311c412

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

f85f806c0bd6b0d2583805d6bdd8d792b311c412