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)
commitb6b5d31e35d39d10b932af8a74612330f7b40961
treec4c2d3df7d472ca98d82a489c7c97d145d27452d
parentfcbf843f56bf894f4899d39d494a5046e4a8f597
parent752be95a475132506c35922d284884cf776149d0
Merge commit '752be95a475132506c35922d284884cf776149d0' into vm-check

Conflicts:

INSTALL
.gitignore