merged with mika
authorMichael Gebetsroither <michael.geb@gmx.at>
Tue, 27 Mar 2007 22:21:00 +0000 (00:21 +0200)
committerMichael Gebetsroither <michael.geb@gmx.at>
Tue, 27 Mar 2007 22:21:00 +0000 (00:21 +0200)

Trivial merge