Remerge merge or whatever
authorPeter Palfrader <peter@palfrader.org>
Thu, 10 Jan 2008 14:53:20 +0000 (15:53 +0100)
committerPeter Palfrader <peter@palfrader.org>
Thu, 10 Jan 2008 14:53:20 +0000 (15:53 +0100)

Trivial merge