Merge commit 'cbee5075d69cb057c4af4c5e24319da90367897f' into vm-check
authorAndy Wingo <wingo@oblong.net>
Tue, 17 Mar 2009 14:56:31 +0000 (15:56 +0100)
committerAndy Wingo <wingo@oblong.net>
Tue, 17 Mar 2009 14:56:31 +0000 (15:56 +0100)

Trivial merge