From: Giuseppe Lettieri <g.lettieri@iet.unipi.it>
Date: Thu, 20 Dec 2012 15:40:50 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.onelab.eu/git/sliver-openvswitch
X-Git-Tag: sliver-openvswitch-1.9.90-2~1
X-Git-Url: http://git.onelab.eu/?p=sliver-openvswitch.git;a=commitdiff_plain;h=ea4392e3e885dff9e41d89a061cf7f2670e436ad

Merge branch 'master' of ssh://git.onelab.eu/git/sliver-openvswitch

Conflicts:
	lib/netdev-pltap.c
---

ea4392e3e885dff9e41d89a061cf7f2670e436ad