Merge branch 't/kill_udp_cq'
authorAndre Noll <maan@systemlinux.org>
Wed, 8 Dec 2010 12:45:42 +0000 (13:45 +0100)
committerAndre Noll <maan@systemlinux.org>
Wed, 8 Dec 2010 12:45:42 +0000 (13:45 +0100)

Trivial merge