Temporary injected some code which will make some tests to fail, as I'm currently merging the ads-mina2 branch into the trunk. The breakage is not serious, though.