Merge remote-tracking branch 'origin/ovs-dev' into bsd-port bsd-port
authorGiuseppe Lettieri <g.lettieri@iet.unipi.it>
Sat, 30 Jun 2012 12:10:38 +0000 (14:10 +0200)
committerGiuseppe Lettieri <g.lettieri@iet.unipi.it>
Sat, 30 Jun 2012 12:10:38 +0000 (14:10 +0200)
commitf95a553be929deaf605c51944533682e9a738b81
treea50ec8fb3535ee60220aceb41eb34c6a0dd720ae
parent4410d91ad58061c82e3ed741ba2c5be493afc29f
parent908ff19af7ab2b6e0a865bcf566aaa47e32889ff
Merge remote-tracking branch 'origin/ovs-dev' into bsd-port

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