From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Sat, 3 Sep 2011 14:48:44 +0000 (-0400)
Subject: Merge branch 'master' into urcu/ht
X-Git-Tag: v0.7.0~43^2~191
X-Git-Url: http://git.liburcu.org/?a=commitdiff_plain;h=92cfe223501f564d3bd726a6c580702daeef4198;hp=92cfe223501f564d3bd726a6c580702daeef4198;p=urcu.git

Merge branch 'master' into urcu/ht

Conflicts:
	Makefile.am

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
---