Merge commit 'remotes/smcv/ready/inline-pagenames' into staging
authorJoey Hess <joey@gnu.kitenet.net>
Fri, 31 Jul 2009 08:25:43 +0000 (10:25 +0200)
committerJoey Hess <joey@gnu.kitenet.net>
Fri, 31 Jul 2009 08:25:43 +0000 (10:25 +0200)

Trivial merge