# HG changeset patch # User Katsumi Yamaoka # Date 1269921534 0 # Node ID eacc14a376e75d218adcaac80398c236ec84b451 # Parent 2450d895e5fd7a71622fe28c45e25bb5a6080ef0# Parent 5860ffa0c5d9ef6b7fddd784d06f7c3555e02e0c Merge from mainline.