# HG changeset patch
# User raph
# Date 1279206525 -7200
# Node ID 6959c2875f4767f9166cf26c5a86ee3b1eb9cb8e
# Parent  7c40b98f627f04f27bc515967195ca2f9794e893# Parent  875e57f5f6ac74a1d6fb0e2623157fff254c338f
Merge with 875e57f5f6ac74a1d6fb0e2623157fff254c338f

diff -r 7c40b98f627f -r 6959c2875f47 buildout.cfg