merge bugfix
authorHannes Gredler <hannes@gredler.at>
Wed, 20 Aug 2008 14:26:00 +0000 (16:26 +0200)
committerHannes Gredler <hannes@gredler.at>
Wed, 20 Aug 2008 14:26:00 +0000 (16:26 +0200)

Trivial merge