Merge branch 'master' into vm
authorAndy Wingo <wingo@pobox.com>
Mon, 12 Jan 2009 22:34:42 +0000 (23:34 +0100)
committerAndy Wingo <wingo@pobox.com>
Mon, 12 Jan 2009 22:34:42 +0000 (23:34 +0100)

Trivial merge