Merge 'trunk' into 'sybase'
Rafael Kitover [Fri, 10 Jul 2009 10:55:40 +0000 (10:55 +0000)]
r5941@hlagh (orig r7009):  ribasushi | 2009-07-09 03:45:02 -0700
 r6995@Thesaurus (orig r6994):  ribasushi | 2009-07-06 01:12:57 +0200
 Where 08108 will come from


Trivial merge