--- /usr/lib/python2.6/optparse.py	2009-06-05 14:09:50.000000000 +0200
+++ optparse.py	2009-06-10 16:29:53.813471785 +0200
@@ -1564,9 +1564,11 @@
         self.print_usage(sys.stderr)
         self.exit(2, "%s: error: %s\n" % (self.get_prog_name(), msg))
 
-    def get_usage(self):
+    def get_usage(self, formatter=None):
         if self.usage:
-            return self.formatter.format_usage(
+            if formatter == None:
+                formatter = self.formatter
+            return formatter.format_usage(
                 self.expand_prog_name(self.usage))
         else:
             return ""
@@ -1625,7 +1627,7 @@
             formatter = self.formatter
         result = []
         if self.usage:
-            result.append(self.get_usage() + "\n")
+            result.append(self.get_usage(formatter) + "\n")
         if self.description:
             result.append(self.format_description(formatter) + "\n")
         result.append(self.format_option_help(formatter))