Merge 'trunk' into 'mysql_ansi'
Peter Rabbitson [Mon, 3 Aug 2009 16:01:44 +0000 (18:01 +0200)]

Trivial merge