sort order regression

[Jesse Rosenthal]

On Thu, 22 Apr 2010 10:21:11 -0400, Jesse Rosenthal <jrosenthal at jhu.edu> wrote:
> My suggestion would be to revert both the simplification and the fix to
> enable the simplification to pass: (36e4459a3, 2a1a4f0551).

Sorry, got that slightly wrong. The following commits need to be
reverted:
 
36e4459a328b8449b3e9d510be81a332a9b35aaa
f43990ce134d838cdb2cdd5d0752a602e81cfdd9
7fb56f9dc5d8e66f717f5e48ecbfbc11c8190182

When I do this, search order is right, and all tests are passed.

Best,
Jesse