clearing up trunk/branch

[brettporter]

I tried to apply a patch today and just confused about where to  
really apply it. I'm not sure we're really adopting all the changes  
on trunk, and developing 2.x before 1.x is out is a bit crazy.

So I'm merging any appropriate changes from the trunk onto the branch  
and switching it back to be trunk. I'm not merging over the arbitrary  
signature and interface changes.

Just a heads up.

- Brett

--
Brett Porter - brett@...
Blog: http://www.devzuz.org/blogs/bporter/