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)

Trivial merge