From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Thu, 3 Nov 2011 14:58:54 +0000 (-0400)
Subject: Merge branch 'master' into urcu/ht-shrink
X-Git-Tag: v0.7.0~43^2~58
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=5f74363e048fb82d7ad97a780eadbeb063840787;p=urcu.git

Merge branch 'master' into urcu/ht-shrink
---

5f74363e048fb82d7ad97a780eadbeb063840787