Merge remote-tracking branch 'amarx/ipsec' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Wed, 28 Nov 2012 21:12:50 +0000 (22:12 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Wed, 28 Nov 2012 21:12:50 +0000 (22:12 +0100)

Trivial merge