From: Jean Privat <jean@pryen.org>
Date: Mon, 18 Apr 2011 16:28:23 +0000 (-0400)
Subject: Merge branch 'alexamdre/various-fixes' into next
X-Git-Tag: v0.5~46
X-Git-Url: http://nitlanguage.org

Merge branch 'alexamdre/various-fixes' into next
---

49668cbe2bcbace9c961a24ae2878834f8b567f5