Txn branch merge

[Emmanuel Lécharny]

Hi guys,

just FYI, I'm currently trying to merge the txn branch into trunk. Not 
sure Il'll be able to do it completely today, but I'll try.

Thanks !

--
Regards,
Cordialement,
Emmanuel Lécharny
www.iktek.com