From f023e040f2a6db54da336ec1cf3fb8010712ddcb Mon Sep 17 00:00:00 2001
From: "Taro L. Saito" <leo@xerial.org>
Date: Thu, 22 Sep 2011 14:41:19 +0900
Subject: [PATCH] merge