From: Giuseppe Lettieri <g.lettieri@iet.unipi.it>
Date: Fri, 5 Jul 2013 17:36:43 +0000 (+0200)
Subject: Merge commit '559eb2308b4d616590aba34bb8f4dd7f12ae4587'
X-Git-Tag: sliver-openvswitch-1.10.90-3~17
X-Git-Url: http://git.onelab.eu/?p=sliver-openvswitch.git;a=commitdiff_plain;h=4816a18f33380a33d381b77d41df39113c94500d

Merge commit '559eb2308b4d616590aba34bb8f4dd7f12ae4587'

Conflicts:
	Makefile.am
---

4816a18f33380a33d381b77d41df39113c94500d
diff --cc Makefile.am
index 5dce7aa81,36beb6c4a..b15a9a4d3
--- a/Makefile.am
+++ b/Makefile.am
@@@ -259,4 -258,4 +259,5 @@@ 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