tree cfbe22a936095883b71d313dbaee26db5a0f5b71
parent 17bd9a2f4c35de29d2539a2ff6851d61be281e25
parent f5456b63ec9fdad37b680fc9fe6fe8222d2c1839
author Jeff Garzik <jeff@garzik.org> 1194272198 -0500
committer Jeff Garzik <jeff@garzik.org> 1194272198 -0500

Merge branch 'dipm-fix' into upstream-fixes