# HG changeset patch
# User Martin Geisler <mg@lazybytes.net>
# Date 1247610260 -7200
# Node ID 5e5a91e39642c246542dc9d1f03c7fa8ada0bbd3
# Parent  6f95c756d9fa04862631a555db7cf664825651ad# Parent  294c5e460b369a383fb85b4985b60b5d06b33853
merge with mpm