b602a45ae8
author Jeff Garzik <jgarzik@pobox.com> 1129817169 -0400
committer Jeff Garzik <jgarzik@pobox.com> 1129817169 -0400

Merge branch 'master'
[QT¾œ4x