Merge 'trunk' into 'sybase'
Rafael Kitover [Wed, 9 Sep 2009 15:28:45 +0000 (15:28 +0000)]
r20588@hlagh (orig r7613):  ribasushi | 2009-09-09 08:16:12 -0400
Fix warning
r20589@hlagh (orig r7614):  ribasushi | 2009-09-09 08:42:49 -0400
Really sanify exception text


Trivial merge