Index: includes/common.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/common.inc,v
retrieving revision 1.596
diff -u -p -r1.596 common.inc
--- includes/common.inc	7 Dec 2006 17:02:25 -0000	1.596
+++ includes/common.inc	8 Dec 2006 17:40:51 -0000
@@ -989,16 +989,18 @@ function parse_size($size) {
  *   A translated string representation of the size.
  */
 function format_size($size) {
-  $suffix = t('bytes');
-  if ($size >= 1024) {
-    $size = round($size / 1024, 2);
-    $suffix = t('KB');
+  if ($size < 1024) {
+    return format_plural($size, '1 byte', '@count bytes');
   }
-  if ($size >= 1024) {
+  else {
     $size = round($size / 1024, 2);
-    $suffix = t('MB');
+    $suffix = t('KB');
+    if ($size >= 1024) {
+      $size = round($size / 1024, 2);
+      $suffix = t('MB');
+    }
+    return t('@size @suffix', array('@size' => $size, '@suffix' => $suffix));
   }
-  return t('@size @suffix', array('@size' => $size, '@suffix' => $suffix));
 }
 
 /**