Incorrect Math in Import routines

When importing, maximum file size is reported and set at 1 MB. Forum post is:
http://forum.civicrm.org/index.php/topic,31240.0.html

In the file: civicrm/CRM/Import/DataSource/CSV.php
The following formula in incorrect:
$uploadSize = round(($uploadFileSize / (1024 * 1024)), 2);

The formula should be:
$uploadSize = round(($uploadFileSize / (1024 * 8)), 2);

This is an apparent miscalculation that has been carried into multiple files. (There may be more, but these are the ones I found.):

civicrm/CRM/Member/Import/Form/DataSource.php
civicrm/CRM/Activity/Import/Form/DataSource.php
civicrm/CRM/Contribute/Import/Form/DataSource.php
civicrm/CRM/Event/Import/Form/DataSource.php

Also, the FIXME line that is just above this seems to be looking at the problem backwards. It appears that if the limit is lower than 8MB, then it sets the limit to 8MB. Not sure that would work with php.ini settings.