# HG changeset patch
# User herrick
# Date 1292212608 18000
# Node ID 88c8a51354d0f77b000877301eb106fc61473580
# Parent  6f09ea1c034f087916d2a8cf0d22be768400118f# Parent  431df3413c47e236b153e73412ee0adefaa431f0
Merge