Merge commit 'upstream/20090110'
authorBen Hutchings <Ben Hutchings ben@decadent.org.uk>
Sun, 15 Feb 2009 18:37:31 +0000 (18:37 +0000)
committerBen Hutchings <Ben Hutchings ben@decadent.org.uk>
Sun, 15 Feb 2009 18:37:31 +0000 (18:37 +0000)

Trivial merge