--- a/mercurial/help.py	Tue Jun 12 14:18:18 2012 +0200
+++ b/mercurial/help.py	Thu Jun 07 01:42:50 2012 +0200
@@ -107,8 +107,8 @@
         for cmd, entry in getattr(mod, 'cmdtable', {}).iteritems():
             if kw in cmd or (len(entry) > 2 and lowercontains(entry[2])):
                 cmdname = cmd.split('|')[0].lstrip('^')
-                if mod.__doc__:
-                    cmddoc = gettext(mod.__doc__).splitlines()[0]
+                if entry[0].__doc__:
+                    cmddoc = gettext(entry[0].__doc__).splitlines()[0]
                 else:
                     cmddoc = _('(no help text available)')
                 results['extensioncommands'].append((cmdname, cmddoc))

--- a/tests/test-help.t	Tue Jun 12 14:18:18 2012 +0200
+++ b/tests/test-help.t	Thu Jun 07 01:42:50 2012 +0200
@@ -775,3 +775,30 @@
   $ hg help revsets | grep helphook
       helphook1
       helphook2
+
+Test keyword search help
+
+  $ hg help -k clone
+  Topics:
+  
+   config     Configuration Files
+   extensions Using Additional Features
+   glossary   Glossary
+   phases     Working with Phases
+   subrepo    Subrepositories
+   urls       URL Paths
+  
+  Commands:
+  
+   update update working directory (or switch revisions)
+   paths  show aliases for remote repositories
+   clone  make a copy of an existing repository
+  
+  Extensions:
+  
+   relink recreates hardlinks between repository clones
+  
+  Extension Commands:
+  
+   qclone clone main and patch repository at same time
+