Merge branch 'mainstream'
authorGiuseppe Lettieri <g.lettieri@iet.unipi.it>
Thu, 31 Jan 2013 14:09:26 +0000 (15:09 +0100)
committerGiuseppe Lettieri <g.lettieri@iet.unipi.it>
Thu, 31 Jan 2013 14:09:26 +0000 (15:09 +0100)
commit305b76debf72120672a8ba81d3356b6dccb1da9a
tree416eeda73c1e15fbb735aa8717ce13fb5c69f114
parentf31282b9c152d5e993c8fe0068b7a4ed8c8d98c8
parentb47e6df6be58e4cf4d876dce5ffa36c42ee6e977
Merge branch 'mainstream'

Conflicts:
lib/dpif-netdev.c
lib/automake.mk
lib/dpif-netdev.c
lib/netdev.c