# HG changeset patch
# User yutaka@localhost.localdomain
# Date 1288966211 -32400
# Node ID 6a2c22cabe10c42a14eecd123b42253fefbf3388
# Parent  e4e96ab3044db62fff9be286d28d69ca63093750# Parent  5418d809dc6aa1fe937fa782c320bb5fde4b487f
merge