[MERGE] Merged with main server

bzr revid: tde@openerp.com-20120323143626-c05edvr4zwtz6pvm

diff --cc .bzrignore
index 62f8a05,a797d0c..8fcfef4
--- 1/.bzrignore
--- 2/.bzrignore
+++ b/.bzrignore
@@@ -1,23 -1,12 +1,18 @@@
- *.pyc
 -.*
 -*.egg-info
 -*.orig
 -*.vim
 +.*.swp
 +.bzrignore
++.idea
++.project
++.pydevproject
++.ropeproject
++.settings
++.DS_Store
 +openerp/addons/*
 +openerp/filestore*
 +.Python
- include
- lib
- bin/activate
- bin/activate_this.py
- bin/easy_install
- bin/easy_install-2.6
- bin/pip
- bin/python
- bin/python2.6
 +*.pyc
 +*.pyo
++bin/*
  build/
- bin/yolk
- bin/pil*.py
- .project
- .pydevproject
- .settings
 -RE:^bin/
 -RE:^dist/
 -RE:^include/
 -
 -RE:^share/
 -RE:^man/
 -RE:^lib/
++include/
++lib/
++share/