Merging changes from trunk to 2.0 branch

I'm back working on version 2.0. If I'm going the PEAR route, I should try to be more PEAR compliant. And that's on the table for 2.0. For merging instructions, this page came in handy: http://svnbook.red-bean.com/en/1.0/ch04s04.html