From: Giuseppe Lettieri <g.lettieri@iet.unipi.it>
Date: Sat, 30 Jun 2012 12:10:38 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/ovs-dev' into bsd-port
X-Git-Url: http://git.onelab.eu/?p=sliver-openvswitch.git;a=commitdiff_plain;h=refs%2Fheads%2Fbsd-port

Merge remote-tracking branch 'origin/ovs-dev' into bsd-port

Conflicts:
	acinclude.m4
	lib/automake.mk
---

f95a553be929deaf605c51944533682e9a738b81
diff --cc lib/automake.mk
index c6db53bcc,feac1d453..be8602bc6
--- a/lib/automake.mk
+++ b/lib/automake.mk
@@@ -238,9 -240,7 +240,10 @@@ endi
  
  if HAVE_IF_DL
  lib_libopenvswitch_a_SOURCES += \
 +	lib/netdev-bsd.c \
 +	lib/rtbsd.c \
 +	lib/rtbsd.h
+ 	lib/route-table-bsd.c
  endif
  
  if HAVE_OPENSSL