Merge branch 'upstream'
authorJoel Rosdahl <joel@debian.org>
Mon, 11 Jan 2010 20:42:16 +0000 (21:42 +0100)
committerJoel Rosdahl <joel@debian.org>
Mon, 11 Jan 2010 20:42:16 +0000 (21:42 +0100)
Conflicts:
src/connection.c


Trivial merge