Nop merge - stuff that was previously included by cherry picking
authorPeter Palfrader <peter@palfrader.org>
Thu, 10 Jan 2008 15:03:47 +0000 (16:03 +0100)
committerPeter Palfrader <peter@palfrader.org>
Thu, 10 Jan 2008 15:03:47 +0000 (16:03 +0100)

Trivial merge