Merge branch 'master' into strings
authorHolger Lubitz <hal@duncan.ol.sub.de>
Wed, 1 Aug 2007 22:13:40 +0000 (00:13 +0200)
committerHolger Lubitz <hal@duncan.ol.sub.de>
Wed, 1 Aug 2007 22:13:40 +0000 (00:13 +0200)

Trivial merge