Merge branch 'tunnel' into stable
authorHenning Rogge <hrogge@googlemail.com>
Fri, 19 Feb 2010 19:00:05 +0000 (20:00 +0100)
committerHenning Rogge <hrogge@googlemail.com>
Fri, 19 Feb 2010 19:00:05 +0000 (20:00 +0100)

Trivial merge