Abdera2 to Trunk

[James Snell]

All... I would like to propose that the current trunk be tagged where
it is and that Abdera2 be made the new trunk. Additional maintenance
updates can continue to be made to the Abdera 1.x stream as necessary.
Here's my +1.

- James