# HG changeset patch # User Katsumi Yamaoka # Date 1275952009 0 # Node ID 3c6930c507d959362f6e12e6cae0cd1a8e1fe1e9 # Parent 68c7ddc1af1631c9fdcca2910839497cf7b8f027# Parent 3877293009092eac6420ca309f9d3a1e5099c077 Merge from mainline.