# HG changeset patch
# User Katsumi Yamaoka <katsumi@flagship2>
# Date 1277507958 0
# Node ID b6c00fb16e8f92d445dc16603cd87564001ff54a
# Parent  edba7a045a727b767b0d0f04f78aea363dfc290f# Parent  16aebfb142a6491685d9645e128ad21f2e4281da
Merge from mainline.