Merge 'trunk' into 'top_limit_tweaks'
Peter Rabbitson [Mon, 18 May 2009 20:14:44 +0000 (20:14 +0000)]
r6304@Thesaurus (orig r6303):  frew | 2009-05-18 21:43:48 +0200
Test to show problem
r6305@Thesaurus (orig r6304):  ribasushi | 2009-05-18 22:12:35 +0200
Failing tests go to branches
r6306@Thesaurus (orig r6305):  ribasushi | 2009-05-18 22:14:26 +0200
Require bugfixed sqla


Trivial merge