Merge branch '0.9.x' of git://gitorious.org/statusnet/mainline into 0.9.x

1 files changed, 2 insertions, 2 deletions

diff --git a/extlib/MIME/Type.php b/extlib/MIME/Type.php
index 8653362d3..c335f8d92 100644
--- a/extlib/MIME/Type.php
+++ b/extlib/MIME/Type.php
@@ -478,7 +478,7 @@ class MIME_Type
 
         // Don't return an empty string
         if (!$type || !strlen($type)) {
-            return PEAR::raiseError("Sorry. Could not determine file type.");
+            return PEAR::raiseError("Sorry, couldn't determine file type.");
         }
 
         // Strip parameters if present & requested
@@ -510,7 +510,7 @@ class MIME_Type
         $fileCmd = PEAR::getStaticProperty('MIME_Type', 'fileCmd');
         if (!$cmd->which($fileCmd)) {
             unset($cmd);
-            return PEAR::raiseError("Cannot find file command \"{$fileCmd}\"");
+            return PEAR::raiseError("Can't find file command \"{$fileCmd}\"");
         }
 
         $cmd->pushCommand($fileCmd, "-bi " . escapeshellarg($file));