# HG changeset patch # User Katsumi Yamaoka # Date 1270590872 0 # Node ID 5a53cd4938e375a16b9a97d8858c2daff8dbad2a # Parent 82349192cc4dc8853a4d1a5daf5e17ceb7d2eab4# Parent 6ab7fa5331f8e4b25efb4f65cf6a54511eb3f25b Merge from mainline.