Merge branch 'next' of repo.nicira.com:/srv/git/openvswitch into next
authorJustin Pettit <jpettit@nicira.com>
Sat, 6 Feb 2010 01:15:29 +0000 (17:15 -0800)
committerJustin Pettit <jpettit@nicira.com>
Sat, 6 Feb 2010 01:15:29 +0000 (17:15 -0800)

Trivial merge