Code review comment for lp:~al-maisan/launchpad/conflict-resolution-20100228

Thanks Muharem! That fixes the soyuz-related failures result of code that *didn't* conflict (as I had to use secure_record on devel for some new tests which were obviously not touched by bigjools' branch).

I'll email about the remaining max_bug_heat issue.