Mon Feb 8 14:33:03 EST 2010 geoff applied the bits that don't involve reformatting. i think i got it all but could have missed some. actually this was mostly done and pushed to sources a while ago, so there's no change to the sources copy today.