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)
commit2af7d4655ae615c261334ffc4dd79a6b7582d6c5
treee422c6c9e947fb9ef6cff57f0e2a25a73ffc3e1a
parent173360594997c33e4685c2a9f26732bdfc8cc805
parent8d6d9ec2d44c984fe6a1f7d294e069b658572952
Merge remote branch 'crater/master' into kq_devices