Yup, that's a merge screw up.  In my defence, I was _very_ tired when I wrote this :D