From 778b369af9da8eb5b07c7bf87629a98a30d4a73f Mon Sep 17 00:00:00 2001
From: MIZUNO Hiroki <mzpppp@gmail.com>
Date: Fri, 5 Aug 2011 00:57:41 -0700
Subject: [PATCH] cherry-pick commit by mzp