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

Trivial merge