Merge commit 'crater/master' into DragonFly_RELEASE_2_2
authorMatthew Dillon <dillon@apollo.backplane.com>
Thu, 5 Feb 2009 05:22:51 +0000 (21:22 -0800)
committerMatthew Dillon <dillon@apollo.backplane.com>
Thu, 5 Feb 2009 05:22:51 +0000 (21:22 -0800)

Trivial merge