# HG changeset patch # User Katsumi Yamaoka # Date 1269994469 0 # Node ID 24df18c009795dec14958a2d2db84ed86b177841 # Parent c852205c36822494ec7d44a5f67e446867f30188# Parent fa375bb9de462dafdc988f16a15a17cbcb603494 Merge from mainline.