Merge commit 'smtms/amd64'
authorMatthew Dillon <dillon@apollo.backplane.com>
Tue, 7 Jul 2009 18:19:59 +0000 (11:19 -0700)
committerMatthew Dillon <dillon@apollo.backplane.com>
Tue, 7 Jul 2009 18:19:59 +0000 (11:19 -0700)

Trivial merge