Merge branch 'wingo'
authorAndy Wingo <wingo@pobox.com>
Sun, 29 Mar 2009 05:31:20 +0000 (22:31 -0700)
committerAndy Wingo <wingo@pobox.com>
Sun, 29 Mar 2009 05:31:20 +0000 (22:31 -0700)

Trivial merge