Synchronize with trunk
authorRichard Kettlewell <rjk@greenend.org.uk>
Fri, 27 Nov 2009 19:28:53 +0000 (19:28 +0000)
committerRichard Kettlewell <rjk@greenend.org.uk>
Fri, 27 Nov 2009 19:28:53 +0000 (19:28 +0000)

Trivial merge