Merge branch 'vpn-nat'
authorThomas Jarosch <thomas.jarosch@intra2net.com>
Fri, 8 Oct 2010 08:48:15 +0000 (10:48 +0200)
committerThomas Jarosch <thomas.jarosch@intra2net.com>
Fri, 8 Oct 2010 08:48:15 +0000 (10:48 +0200)

Trivial merge