merged
authorMichael Gebetsroither <michael.geb@gmx.at>
Fri, 9 Mar 2007 19:03:36 +0000 (20:03 +0100)
committerMichael Gebetsroither <michael.geb@gmx.at>
Fri, 9 Mar 2007 19:03:36 +0000 (20:03 +0100)

Trivial merge