Merge 'trunk' into 'sybase_refactor'
Peter Rabbitson [Mon, 23 Nov 2009 00:29:04 +0000 (00:29 +0000)]
r7947@Thesaurus (orig r7935):  ribasushi | 2009-11-23 01:18:28 +0100
Whoops
r7948@Thesaurus (orig r7936):  ribasushi | 2009-11-23 01:28:50 +0100
Fix ::Versioned regression introduced in r7925


Trivial merge