# HG changeset patch
# User Adam Chlipala <adamc@hcoop.net>
# Date 1222620290 14400
# Node ID 422865e240b1e1cd8bf4bfd3145eb4f3c01dbd89
# Parent  9ceee967b1fcb146c6c22d332e5ba32d4118f803# Parent  ce0c9d481ee3febe34eb79825cfe9c553c0c292b
Merge