merge hannes' private tree
authorHannes Gredler <hannes@gredler.at>
Tue, 22 Jan 2008 22:27:02 +0000 (23:27 +0100)
committerHannes Gredler <hannes@gredler.at>
Tue, 22 Jan 2008 22:27:02 +0000 (23:27 +0100)

Trivial merge