Merge branch 'docfix'
authorSebastian Pipping <sebastian@pipping.org>
Mon, 13 Dec 2010 07:58:17 +0000 (08:58 +0100)
committerSebastian Pipping <sebastian@pipping.org>
Mon, 13 Dec 2010 07:58:17 +0000 (08:58 +0100)

Trivial merge