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

Trivial merge