Forward-port the handling of addition and subtraction in the same section from buildout 1

See http://svn.zope.org/zc.buildout/trunk/?rev=127336&view=rev; this fix was made after buildout 2 was branched off.