Merge branch 'master' of ssh://git.onelab.eu/git/sliver-openvswitch
authorThierry Parmentelat <thierry.parmentelat@inria.fr>
Wed, 3 Oct 2012 16:29:55 +0000 (18:29 +0200)
committerThierry Parmentelat <thierry.parmentelat@inria.fr>
Wed, 3 Oct 2012 16:29:55 +0000 (18:29 +0200)

Trivial merge