# HG changeset patch
# User asaha
# Date 1308962234 25200
# Node ID efc895dbe5c388a2665757739a02810cb9843c6b
# Parent  58bc532d63418ac3c9b42460d89cdaf595c6f3e1# Parent  d34578643d1c6c752d4a6b5e79c6ab1b60850b4a
Merge