r Jeff Garzik <jgarzik@pobox.com> 1138347466 -0500
committer Jeff Garzik <jgarzik@pobox.com> 1138347466 -0500

Merge branch 'tmp'
(�RK�