Merge branch 'dipm-fix' into upstream-fixes
authorJeff Garzik <jeff@garzik.org>
Mon, 5 Nov 2007 14:16:38 +0000 (09:16 -0500)
committerJeff Garzik <jeff@garzik.org>
Mon, 5 Nov 2007 14:16:38 +0000 (09:16 -0500)
commit152af05cc85119d294b977ab4de07a781795c298
treecfbe22a936095883b71d313dbaee26db5a0f5b71
parent17bd9a2f4c35de29d2539a2ff6851d61be281e25
parentf5456b63ec9fdad37b680fc9fe6fe8222d2c1839
Merge branch 'dipm-fix' into upstream-fixes