Merge commit 'crater/master' into DragonFly_RELEASE_2_2
authorMatthew Dillon <dillon@apollo.backplane.com>
Sun, 15 Feb 2009 00:42:41 +0000 (16:42 -0800)
committerMatthew Dillon <dillon@apollo.backplane.com>
Sun, 15 Feb 2009 00:42:41 +0000 (16:42 -0800)

Trivial merge