# HG changeset patch
# User asaha
# Date 1320731529 28800
# Node ID c4478931e22de793424ab226abf2c42171be8eac
# Parent  ae25163501bc7477cd907e26a006a6f1b05fdb6d# Parent  34e175c1fabce6ae66eaf666c6f626380ce0a47b
Merge