Hm.  I thought I checked in a change to fix this a while ago on the trunk.