Merge commit '752be95a475132506c35922d284884cf776149d0' into vm-check
authorAndy Wingo <wingo@oblong.net>
Tue, 17 Mar 2009 14:54:34 +0000 (15:54 +0100)
committerAndy Wingo <wingo@oblong.net>
Tue, 17 Mar 2009 14:54:34 +0000 (15:54 +0100)
Conflicts:

INSTALL

1  2 
.gitignore

diff --cc .gitignore
Simple merge