Merge proposals dependent on lp://staging/~shanx/zc.buildout/trunk

lp://staging/~shanx/zc.buildout/trunk has no merge proposals.