Resolved merge conflicts.

lib/python/OFS/Document.py

 """Document object"""
 
-__version__='$Revision: 1.12 $'[11:-2]
+__version__='$Revision: 1.13 $'[11:-2]
 
 from Globals import HTML
 from Globals import HTMLFile
@@ -18,9 +18,7 @@ class Document(HTML, RoleManager):
     meta_type  ='Document'
     title=''
     icon       ='OFS/Document_icon.gif'
-
-    manage_options=()
-
+    
     __state_names__=HTML.__state_names__+('title','__roles__')
 
     _formhead="""