merge from HEAD

Author: Richard Jones

CHANGES.txt

@@ -12,6 +12,7 @@ Fixed:
 - make user permissions check more sane (fix search page for anonymous)
 - fixed RDBMS filter() for no matches from full-text search (sf bug 990778)
 - fixed DateHTMLProperty for invalid date entry (sf bug 986538)
+- fixed external password source example (sf bug 986601)
 
 
 2004-06-24 0.7.5

doc/customizing.txt

@@ -2963,9 +2963,9 @@ need to override the standard ``verifyPassword`` method defined in
             return 0
 
     class Client(client.Client):
-        actions = client.Client.actions + (
-            ('login', ExternalPasswordLoginAction)
-        )
+        actions = (
+            ('login', ExternalPasswordLoginAction),
+        ) + client.Client.actions
 
 What this does is look through the file, line by line, looking for a
 name that matches.