Merge 'trunk' into 'sybase_mssql'
Peter Rabbitson [Thu, 30 Apr 2009 06:28:04 +0000 (23:28 -0700)]
r6039@mullet (orig r6038):  ribasushi | 2009-04-30 01:28:04 -0700
Release 0.08102


Trivial merge