pmclanahan/mozillians — comment on commit a861fc34cb9fd1d3d84a254b590dbb370ce69288
File:  line 0
By davedash:

Make the fixes rebase them in so it looks like you coded perfectly and then we can check this into mozilla/master. Our strategy shoudl be to commit back to mozilla master as much as we can without interfering.