Merge branch 'stable' into tunnel
authorHenning Rogge <hrogge@googlemail.com>
Mon, 25 Jan 2010 19:12:14 +0000 (20:12 +0100)
committerHenning Rogge <hrogge@googlemail.com>
Mon, 25 Jan 2010 19:12:14 +0000 (20:12 +0100)

Trivial merge