# HG changeset patch
# User Augie Fackler <raf@durin42.com>
# Date 1378242379 14400
# Node ID ad09fc68ef6f4596e2b36289960bb5fc2f974007
# Parent  187bf2dde7c11b073c384de6a1470eba2707eefb# Parent  4b83bcc1f96596d7a2a6c92e41072799339217ae
merge with mpm