Merge 'trunk' into 'mssql_top_fixes'
Peter Rabbitson [Tue, 9 Jun 2009 04:56:41 +0000 (06:56 +0200)]
r6553@Thesaurus (orig r6552):  ribasushi | 2009-06-08 23:56:41 +0200
duh


Trivial merge