Merge 'mystery_join' into 'trunk'

r6544@Thesaurus (orig r6543):  ribasushi | 2009-06-08 11:44:59 +0200
Attempt to figure out why do we repeat joins on complex search_related
r6586@Thesaurus (orig r6585):  ribasushi | 2009-06-10 11:22:05 +0200
Move the rs preservation test to a more suitable place
r6589@Thesaurus (orig r6588):  ribasushi | 2009-06-10 13:15:48 +0200
Finally commit trully failing test
r6590@Thesaurus (orig r6589):  ribasushi | 2009-06-10 13:33:14 +0200
Duh, this was a pretty simple bug