# HG changeset patch # User Katsumi Yamaoka # Date 1262908192 0 # Node ID 14f1e1d973968f854f74126e22ad7503575c7212 # Parent 41ffd6d293f4c9a49d029d06763c4894936ef713# Parent e778a4a0f82171d2ba78486f05c5217a935d0546 Merge from mainline.