Merge commit 'origin/master' into vm
authorAndy Wingo <wingo@pobox.com>
Thu, 15 Jan 2009 21:13:03 +0000 (22:13 +0100)
committerAndy Wingo <wingo@pobox.com>
Thu, 15 Jan 2009 21:13:03 +0000 (22:13 +0100)
Conflicts:

INSTALL


Trivial merge