Merge both lines

diff --cc becommands/help.py
index cae8949de2482030e15c191d2e3d4014fa8c0e3f,2f37ec2b2c4b90a6a1adeb3580d778a04c552a14..1402a2a901a0ee04670509d28f6afd8a44733ab7
--- 1/becommands/help.py
--- 2/becommands/help.py
+++ b/becommands/help.py
@@@ -24,9 -24,14 +24,13 @@@ def execute(args)
      if len(args) > 1:
          raise cmdutil.UserError("Too many arguments.")
      if len(args) == 0:
 -        for name, module in cmdutil.iter_commands():
 -            print "be %s\n     %s" % (name, module.__doc__)
 +        print_command_list()
      else:
-         print cmdutil.help(args[0])
+         try:
+             print cmdutil.help(args[0])
+         except AttributeError:
+             print "No help available"
+     
      return
  
  

diff --cc libbe/cmdutil.py
Simple merge