Before other development continues in the trunk,
all changes that the stable branch has seen since
v_3_0_branchpoint, minus those that were also
applied to the trunk, should be applied.
This is a particularly nasty, since some log entries
from branch, trunk/Attic (brfore more to src) and
trunk/src have to be compared. Note for next time:
branch on stable release, not before.