merge sven-ola's tree
authorHannes Gredler <hannes@gredler.at>
Fri, 4 Jan 2008 12:52:57 +0000 (13:52 +0100)
committerHannes Gredler <hannes@gredler.at>
Fri, 4 Jan 2008 12:52:57 +0000 (13:52 +0100)

Trivial merge