Merge branch 'alexamdre/various-fixes' into next
authorJean Privat <jean@pryen.org>
Mon, 18 Apr 2011 16:28:23 +0000 (12:28 -0400)
committerJean Privat <jean@pryen.org>
Mon, 18 Apr 2011 16:28:32 +0000 (12:28 -0400)

Trivial merge