From: Giuseppe Lettieri <g.lettieri@iet.unipi.it>
Date: Sat, 6 Jul 2013 17:00:44 +0000 (+0200)
Subject: Merge branch 'mainstream'
X-Git-Tag: sliver-openvswitch-1.10.90-3~4
X-Git-Url: http://git.onelab.eu/?p=sliver-openvswitch.git;a=commitdiff_plain;h=a12945b3b8cd4d483e5e8f2a1adb6576badf1d4d

Merge branch 'mainstream'
---

a12945b3b8cd4d483e5e8f2a1adb6576badf1d4d