Merge remote branch 'crater/master' into kq_devices
authorMatthew Dillon <dillon@apollo.backplane.com>
Fri, 9 Jul 2010 00:37:24 +0000 (17:37 -0700)
committerMatthew Dillon <dillon@apollo.backplane.com>
Fri, 9 Jul 2010 00:37:24 +0000 (17:37 -0700)

Trivial merge