fix previous commit setup.build
Merge remote-tracking branch 'remotes/openpetragit_readonly/backport2013_04' into release2013_04

Conflicts:
	setup/setup.build