# HG changeset patch # User Katsumi Yamaoka # Date 1269412153 0 # Node ID e6a6d8c247e46292d1e4d8855f7d743d40b12341 # Parent 40292a5708c2d1ae22523e0073f1fc65e8e9a150# Parent daf1d382bc07d875d6449ed57e8c296fd8de8619 Merge from mainline.