# HG changeset patch # User Katsumi Yamaoka # Date 1269858166 0 # Node ID aaff69467d86600be2bb23b2de131ea6d851710b # Parent 570e94788418c523d210e3a12f2d3f175efaa604# Parent 360db9adc3477dbfef19fa310981cec8c8dea4df Merge from mainline.