Merge branch 'upstream'
authorJoel Rosdahl <joel@debian.org>
Mon, 11 Jan 2010 20:47:02 +0000 (21:47 +0100)
committerJoel Rosdahl <joel@debian.org>
Mon, 11 Jan 2010 20:47:02 +0000 (21:47 +0100)

Trivial merge