Merge 'trunk' into 'mssql_storage_minor_refactor'
Rafael Kitover [Tue, 4 Aug 2009 21:18:27 +0000 (17:18 -0400)]
r9068@hlagh (orig r7198):  caelum | 2009-08-04 16:18:27 -0400
update Changes


Trivial merge