Oh, also, could you [squash](http://gitready.com/advanced/2009/02/10/squashing-commits-with-rebase.html) the commits together? (Just so there's not a "ghost" change that is added in one commit and removed in the next.)