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

Trivial merge