[loom:MERGE] fixing "main" part of setup.py

[Eric Siegerman]

On Tue, 2008-04-01 at 12:13 -0400, Aaron Bentley wrote: 
> > And here is the patch. Is it mergeable patch actually?
> 
> No.  The bundle doesn't contain the necessary revisions, because you
> specified the wrong submit_branch.

Yet the diff does contain the change.  It seems odd to me that the diff
and bundle wouldn't agree.

Is that the intended behaviour?

  - Eric