Merge branch 'alexis/various-fixes' into wip
authorJean Privat <jean@pryen.org>
Tue, 25 Jan 2011 02:35:09 +0000 (21:35 -0500)
committerJean Privat <jean@pryen.org>
Tue, 25 Jan 2011 02:35:09 +0000 (21:35 -0500)

Trivial merge