--- /usr/lib/python2.6/optparse.py	2009-06-05 14:09:50.000000000 +0200
+++ optparse.py	2009-06-10 17:30:03.231591999 +0200
@@ -1566,11 +1566,18 @@
 
     def get_usage(self):
         if self.usage:
-            return self.formatter.format_usage(
-                self.expand_prog_name(self.usage))
+            return self.expand_prog_name(self.usage)
         else:
             return ""
 
+    def format_usage(self, formatter=None):
+        usage = self.get_usage()
+        if usage:
+            if formatter == None:
+                formatter = self.formatter
+            usage = formatter.format_usage(usage)
+        return usage
+
     def print_usage(self, file=None):
         """print_usage(file : file = stdout)
 
@@ -1625,7 +1632,7 @@
             formatter = self.formatter
         result = []
         if self.usage:
-            result.append(self.get_usage() + "\n")
+            result.append(self.format_usage(formatter) + "\n")
         if self.description:
             result.append(self.format_description(formatter) + "\n")
         result.append(self.format_option_help(formatter))