Merge branch 'stable' into tunnel
authorHenning Rogge <hrogge@googlemail.com>
Tue, 5 Jan 2010 17:29:18 +0000 (18:29 +0100)
committerHenning Rogge <hrogge@googlemail.com>
Tue, 5 Jan 2010 17:29:18 +0000 (18:29 +0100)

Trivial merge