Merge branch 'master' of ssh://git.onelab.eu/git/sliver-openvswitch
authorGiuseppe Lettieri <g.lettieri@iet.unipi.it>
Wed, 3 Oct 2012 16:24:20 +0000 (18:24 +0200)
committerGiuseppe Lettieri <g.lettieri@iet.unipi.it>
Wed, 3 Oct 2012 16:24:20 +0000 (18:24 +0200)

Trivial merge