export not exporting all contribution records

When doing a contribution export, there are cases where not all contributions are included in the exported. This seems to be caused by a SELECT DISTINCT somewhere in CRM/Contact/BAO/Query.php as Lobo indicated in this discussion: http://forum.civicrm.org/index.php/topic,21824.msg97217.html#msg97217

The case where we are experiencing this involves multiple contributions for an individual and we include billing address fields in the export. If we export just primary fields, or choose a custom list of fields to export without billing address then we get all the contributions. If we export billing address, which we need to do, then we only get one row per contact.

The SELECT DISTINCT matches the problem but the file in question is rather large and involved, and there is potential to break other things if I just remove DISTINCT from the code.

Thanks for looking into this.