Merge branch 'doc' into wip
authorJean Privat <jean@pryen.org>
Thu, 17 Feb 2011 18:55:40 +0000 (13:55 -0500)
committerJean Privat <jean@pryen.org>
Thu, 17 Feb 2011 18:55:40 +0000 (13:55 -0500)

Trivial merge