Merge commit '95a040cd2be7ad03bf197edbdb1fec2c52749ef6' into vm-check
authorAndy Wingo <wingo@oblong.net>
Tue, 17 Mar 2009 15:05:47 +0000 (16:05 +0100)
committerAndy Wingo <wingo@oblong.net>
Tue, 17 Mar 2009 15:05:47 +0000 (16:05 +0100)

Trivial merge