diff -r e4274f9f97c8 -r 40c06bbf58be doc/gendoc.py
--- a/doc/gendoc.py	Wed Jun 09 12:45:48 2010 +0100
+++ b/doc/gendoc.py	Sun Jun 06 17:25:00 2010 +0900
@@ -25,7 +25,11 @@
     return (shortdesc, desc)
 
 def get_opts(opts):
-    for shortopt, longopt, default, desc in opts:
+    for opt in opts:
+        if len(opt) == 5:
+            shortopt, longopt, default, desc, optlabel = opt
+        else:
+            shortopt, longopt, default, desc = opt
         allopts = []
         if shortopt:
             allopts.append("-%s" % shortopt)