the big merge

[Martin Matusiak]

I've done a big merge to produce a super set of all our branches. You
guys can pull from me, it should apply cleanly. My unittests and
Thejaswi's doctests are both included and we now have 8 tests that
complete successfully. :)

Martin

[Thejaswi Puthraya]

Hi Martin and Steve,

Great work! Now time for me to rewrite the doctests to unittests :)

 

Martin

--
Cheers
Thejaswi Puthraya
http://thejaswi.info/

[Stefan Kögl]

Great work, thanks! I've merged your tree and will have a closer look on
the situation, and maybe do some additional development, around next
weekend.

-- Stefan