From 99f813b4691d01f6c36d8ffbadb8477a09bda04a Mon Sep 17 00:00:00 2001
From: Eric Laurent <elaurent@google.com>
Date: Thu, 4 Feb 2010 04:26:56 -0800
Subject: [PATCH] Fix merge error in previous commit
 457a471ec2d74eb2f4f6723be0797155aed22fa1.