Replace the busted merge, d3e9df9be570, with the correct one, 6482acdf3049.

This commit is contained in:
Jason Orendorff 2008-06-06 17:54:09 -05:00
commit 101cdfdffd