Subject: fix merged to trunk

From: Paul Eggert <[email-masked]>
Date: Wed, 23 Mar 2011 15:06:46 -0700

I committed a fix to the trunk for this,
as part of a recent merge (bzr 103721).