2009-01-28 - production
04:17 <brion> merging r46419, r46421 -- search display fixlets [production]