Merge branch 'dipm-fix' into upstream-fixes

This commit is contained in:
Jeff Garzik 2007-11-05 09:16:38 -05:00
commit 152af05cc8