merged
authorMichael Gebetsroither <michael.geb@gmx.at>
Tue, 18 Jul 2006 21:09:36 +0000 (23:09 +0200)
committerMichael Gebetsroither <michael.geb@gmx.at>
Tue, 18 Jul 2006 21:09:36 +0000 (23:09 +0200)

Trivial merge