Hmm...ok, apparently git hosed me on this latest merge.  I'll fix this one too.