ik.org> 1148693438 -0400
committer Jeff Garzik <jeff@garzik.org> 1148693438 -0400

Merge branch 'master' into upstream
p*Xm™