# HG changeset patch # User Katsumi Yamaoka # Date 1284015110 0 # Node ID aead7f692ad8d9338246b5572dbc36fe9f514773 # Parent ed38b7a7f11ef54fdadca0e050c9bd7306a00157# Parent 9262b6c460dcfe45f5286d079f43839b1daf7e9e Merge from mainline.