[Laszlo-dev] change in doctools: putting paperpie to bed

[Benjamin Shine]

I'm going to go back to doing doctools work in trunk. At this point  
the changes are becoming more content-oriented than tools oriented,  
so there's more of a risk of merge conflicts. Working in the same  
branch will minimize the duration of a divergence.

There are two more changes to paperpie that have to be merged to  
trunk. I'll do those merges today or tomorrow.

This will simplify reporting and verifying bugs -- no confusion about  
what branch they're in -- and lighten the load on our build machines  
& our build engineer.

-ben