Merge upstream
authorJohn Carr <john.carr@unrouted.co.uk>
Tue, 30 Dec 2008 18:11:20 +0000 (18:11 +0000)
committerJohn Carr <john.carr@unrouted.co.uk>
Tue, 30 Dec 2008 18:11:20 +0000 (18:11 +0000)

Trivial merge