From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Fri, 11 Nov 2011 17:28:46 +0000 (-0500)
Subject: Merge branch 'master' of git.lttng.org:/home/git/lttng-ust
X-Git-Tag: v1.9.1~109
X-Git-Url: http://git.lttng.org/?a=commitdiff_plain;h=39f98c62fa2eb208bc24230dc2d669132e08a1fa;p=lttng-ust.git

Merge branch 'master' of git.lttng.org:/home/git/lttng-ust
---

39f98c62fa2eb208bc24230dc2d669132e08a1fa