Merge branch 'master' of git://openvswitch.org/openvswitch

diff --combined lib/automake.mk
index 8f081eb,94b86f6..a7f469c
--- 1/lib/automake.mk
--- 2/lib/automake.mk
+++ b/lib/automake.mk
@@@ -79,6 -79,8 +79,8 @@@ lib_libopenvswitch_a_SOURCES = 
        lib/lockfile.h \
        lib/mac-learning.c \
        lib/mac-learning.h \
+       lib/match.c \
+       lib/match.h \
        lib/memory.c \
        lib/memory.h \
        lib/meta-flow.c \
@@@ -86,7 -88,6 +88,7 @@@
        lib/multipath.c \
        lib/multipath.h \
        lib/netdev-dummy.c \
 +      lib/netdev-tunnel.c \
        lib/netdev-provider.h \
        lib/netdev.c \
        lib/netdev.h \
@@@ -180,8 -181,6 +182,8 @@@
        lib/timeval.h \
        lib/token-bucket.c \
        lib/token-bucket.h \
 +      lib/tunalloc.c \
 +      lib/tunalloc.h \
        lib/type-props.h \
        lib/unaligned.h \
        lib/unicode.c \