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)
commitd5968e7f4e96d957157a31e577d8792afe655371
tree7f18144704b07821d02f797601f00cfacaf360fd
parent616167fc12fd42c14e021b5496e91154b3a0e8c0
parentbf4200ca9f1b288d2eddc344fd315f8a3d199661
Merge branch 'master' into vm