Merge branch 'master' of ssh://git.onelab.eu/git/sliver-openvswitch
authorGiuseppe Lettieri <g.lettieri@iet.unipi.it>
Mon, 22 Apr 2013 10:52:15 +0000 (12:52 +0200)
committerGiuseppe Lettieri <g.lettieri@iet.unipi.it>
Mon, 22 Apr 2013 10:52:15 +0000 (12:52 +0200)

Trivial merge