Merge branch 'newparser'
authorStefan de Konink <stefan@konink.de>
Sun, 21 Nov 2010 16:15:39 +0000 (21 17:15 +0100)
committerStefan de Konink <stefan@konink.de>
Sun, 21 Nov 2010 16:15:39 +0000 (21 17:15 +0100)

Trivial merge