Cleanup of out-of-sync tests
Applying fixes for gcc 4.3 build issues (closes LP: #169115)
moving trunk for module inkscape