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)
commit0c91a9105d6092e0095b74baa9b6ec527399cfa8
tree7f3cf7a57a3c89f4f702da7efbe8f39aff0124da
parent7aa6f86b77836b4bfe1a59feab7d08517177858e
parent9ffef3c6f621bd4de70a0eb0dae4bb96c6026a79
Merge commit 'origin/master' into vm

Conflicts:

INSTALL