# HG changeset patch
# User raph
# Date 1271756253 -7200
# Node ID 9075dc2fb93c7d2a915f2f0cbe3b382bef63d98c
# Parent  7b7ba5e472685e124441dcd8acef17ea9b8d80f2# Parent  0371caf8bcc6864a0f2250933431d3a913c9b379
Merge with 0371caf8bcc6864a0f2250933431d3a913c9b379