# HG changeset patch # User Katsumi Yamaoka # Date 1270208170 0 # Node ID ede2e6005460b6c5ff9a673170ddfae73e6e4a81 # Parent 763c361da2e2b1380e9e33f2af96f811bad09fcb# Parent accaa16963c3d0a3a05e592ae077a328795b1ffb Merge from mainline.