From: Giuseppe Lettieri <g.lettieri@iet.unipi.it>
Date: Fri, 25 Oct 2013 20:15:00 +0000 (+0200)
Subject: Merge branch 'mainstream'
X-Git-Tag: sliver-openvswitch-2.0.90-1~7
X-Git-Url: http://git.onelab.eu/?p=sliver-openvswitch.git;a=commitdiff_plain;h=2431be1b68d386bd616378d2c528242775c4d54a

Merge branch 'mainstream'
---

2431be1b68d386bd616378d2c528242775c4d54a
diff --cc Makefile.am
index 32e85d1e6,b1ad24d9d..d8cc733be
--- a/Makefile.am
+++ b/Makefile.am
@@@ -274,5 -276,5 +277,6 @@@ include rhel/automake.m
  include xenserver/automake.mk
  include python/automake.mk
  include python/compat/automake.mk
 +include planetlab/automake.mk
  include tutorial/automake.mk
+ include vtep/automake.mk