fixes to build on linux
http://bazaar.launchpad.net/~openpetracore/openpetraorg/trunkhosted/revision/2238
Merge remote-tracking branch 'remotes/openpetragit_readonly/backport2013_04' into release2013_04