* Merged with b0dbbda15813.
authorAndreas HUBERT <andreas.hubert@gmx.at>
Sat, 18 Oct 2008 10:36:55 +0000 (12:36 +0200)
committerAndreas HUBERT <andreas.hubert@gmx.at>
Sat, 18 Oct 2008 10:36:55 +0000 (12:36 +0200)

Trivial merge