Branch patch11 had somewhere been lost in bzr hell.
Conflicts:
account/account_move_line.py
document_webdav/nodes.py
document_webdav/webdav_server.py
event_project/__init__.py
users_ldap/users_ldap.py
bzr revid: p_christ@hol.gr-20101223155444-ym8r0g4208gm88j9
* Add new configuration wizard to set resource directiory for Sale order, Product or Project
* Support pptx2txt, docx2txt in content index.
* Add new configuration wizard to browse FTP Server in document_ftp module
* Improved Configuration wizard to set url of FTP Server
bzr revid: hmo@tinyerp.com-20100624094827-9yfmtiiegoiu0asa