Merge branch 'ovs-dev' of /usr/local/git/openvswitch into ovs-dev
authorGiuseppe Lettieri <g.lettieri@iet.unipi.it>
Thu, 21 Jun 2012 09:24:15 +0000 (11:24 +0200)
committerGiuseppe Lettieri <g.lettieri@iet.unipi.it>
Thu, 21 Jun 2012 09:24:15 +0000 (11:24 +0200)

Trivial merge