# HG changeset patch
# User asaha
# Date 1303425787 25200
# Node ID e68bfaa6e25c8acb749f76d62cc9ab592c974759
# Parent  1010e64fca31c73d98dd7cdf8bed36ccc7a12543# Parent  f7ee612f9c23fcba336a02c5a33a08a4a8a2d810
Merge