# HG changeset patch
# User sugi
# Date 1397637224 -32400
# Node ID 712f9e57806ec4ffef6145f950c624124a4fa880
# Parent  c81dff5460b05b16d6900aba2e422a0167614313# Parent  9a804d4db49186ae4aa61ab742daecc4098d92b8
merge