some adaptations to changes in contrib.freigt
Authored by: oblonski 2012-02-29
Parent: [r18573]
Child: [r18575]