From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Wed, 14 Dec 2011 20:41:18 +0000 (-0500)
Subject: Merge branch 'master' into urcu/ht-shrink
X-Git-Tag: v0.7.0~43^2~19
X-Git-Url: http://git.lttng.org./?a=commitdiff_plain;h=87159645a8b732c34e502b0852f095da8e08800f;p=urcu.git

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

87159645a8b732c34e502b0852f095da8e08800f