# HG changeset patch
# User asaha
# Date 1303425787 25200
# Node ID dd06e8d3da912120e828b3392369b336b413b070
# Parent  6133c9ee3a0138ad02d33620cfd013825a188929# Parent  b626f78c57e11c4183bcc906fc7fb87f08d01f46
Merge