Merge remote-tracking branch 'ms/openvswitch'
authorMichael Tremer <michael.tremer@ipfire.org>
Wed, 1 Aug 2012 20:08:13 +0000 (22:08 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Wed, 1 Aug 2012 20:08:13 +0000 (22:08 +0200)

Trivial merge