* Merged with 5c0d843cb949.
authorAndreas HUBERT <andreas.hubert@gmx.at>
Thu, 16 Oct 2008 06:57:27 +0000 (08:57 +0200)
committerAndreas HUBERT <andreas.hubert@gmx.at>
Thu, 16 Oct 2008 06:57:27 +0000 (08:57 +0200)

Trivial merge