manual branch merge
authorHannes Gredler <hannes@gredler.at>
Fri, 30 May 2008 14:58:30 +0000 (16:58 +0200)
committerHannes Gredler <hannes@gredler.at>
Fri, 30 May 2008 14:58:30 +0000 (16:58 +0200)

Trivial merge