# HG changeset patch # User Katsumi Yamaoka # Date 1273216309 0 # Node ID c5156d99ad78c85f2c967795f05ca335becf3fc2 # Parent c0d13767677a3f28e75cdc43b5a887c2cf87e897# Parent 89e25734c87baf6fbf4217a0c6fffcfab336075c Merge from mainline.