Merge upstream
authorJohn Carr <john.carr@unrouted.co.uk>
Wed, 24 Dec 2008 23:13:57 +0000 (23:13 +0000)
committerJohn Carr <john.carr@unrouted.co.uk>
Wed, 24 Dec 2008 23:13:57 +0000 (23:13 +0000)

Trivial merge