# HG changeset patch # User Katsumi Yamaoka # Date 1269820850 0 # Node ID 4d8dad8e3edaf2465ca7e3775b795362e5faaf5f # Parent be11042041cb4d1049ac575f4026c637a9db9417# Parent 510ea81324e31bf4e245165a11706bc6280d961a Merge from mainline.