Empty merge
authorPeter Palfrader <peter@palfrader.org>
Tue, 25 Dec 2007 19:32:28 +0000 (20:32 +0100)
committerPeter Palfrader <peter@palfrader.org>
Tue, 25 Dec 2007 19:32:28 +0000 (20:32 +0100)

Trivial merge