Merge branch 'various-fixes' into next
authorJean Privat <jean@pryen.org>
Tue, 15 Feb 2011 13:52:54 +0000 (08:52 -0500)
committerJean Privat <jean@pryen.org>
Tue, 15 Feb 2011 13:52:54 +0000 (08:52 -0500)

Trivial merge