Code

Merge branch 'master' into pdf
authorSebastian Harl <sh@tokkee.org>
Wed, 24 Nov 2010 20:04:25 +0000 (21:04 +0100)
committerSebastian Harl <sh@tokkee.org>
Wed, 24 Nov 2010 20:04:25 +0000 (21:04 +0100)

Trivial merge