* Merged with a6e2f452a639.
authorAndreas HUBERT <andreas.hubert@gmx.at>
Sat, 18 Oct 2008 15:20:14 +0000 (17:20 +0200)
committerAndreas HUBERT <andreas.hubert@gmx.at>
Sat, 18 Oct 2008 15:20:14 +0000 (17:20 +0200)

Trivial merge