Merge of 1.1 changes into Trunk complete

[John Sisson]

I have merged all the changes in the 1.1 branch that weren't merged to 
trunk (since trunk was copied from the 1.1 branch in rev 409124).

All future changes you make in the 1.1 branch  (after rev 410704) should 
be merged to trunk as soon as possible.

Thanks,

John