# HG changeset patch # User Katsumi Yamaoka # Date 1271198964 0 # Node ID eb72bd4ec8f0bd70a02b9f64744ef15f5840c0b2 # Parent 744ecddd96434ae1b0d64ba1f5c9f6c8134863c8# Parent 3022f1f90ee233518231221c8f70881611feedfa Merge from mainline.