Merged the "edwin-replacement" branch that I pushed accidentally.
authorEdwin Steiner <edwin.steiner@gmx.net>
Sun, 17 Feb 2008 17:53:21 +0000 (18:53 +0100)
committerEdwin Steiner <edwin.steiner@gmx.net>
Sun, 17 Feb 2008 17:53:21 +0000 (18:53 +0100)

Trivial merge