Merge branch 'master' of ssh://git.onelab.eu/git/sliver-openvswitch
authorThierry Parmentelat <thierry.parmentelat@inria.fr>
Thu, 4 Oct 2012 22:30:56 +0000 (00:30 +0200)
committerThierry Parmentelat <thierry.parmentelat@inria.fr>
Thu, 4 Oct 2012 22:30:56 +0000 (00:30 +0200)

Trivial merge