[MERGE] merge from trunk.

bzr revid: vmt@openerp.com-20110321132318-8dp8xz8r8wr7q5ar

diff --cc MANIFEST.in
index 1c615eb,47fbb67..ef07573
--- 1/MANIFEST.in
--- 2/MANIFEST.in
+++ b/MANIFEST.in
@@@ -1,16 -1,18 +1,17 @@@
 -include rpminstall_sh.txt
 +include rpminstall_sh.txt # TODO do we need this file ?
  include README
- include MANIFEST.in       # TODO do we really need this three files ?
+ include LICENSE
+ include MANIFEST.in
  include setup.nsi
  include setup.cfg
 -include bin/import_xml.rng
 -include bin/server.cert
 -include bin/server.pkey
 -include bin/gpl.txt
 +#include openerp/server.cert
 +#include openerp/server.pkey
 +#include openerp/gpl.txt
  include man/openerp-server.1
  include man/openerp_serverrc.5
 -recursive-include pixmaps *
 -recursive-include win32 *
 -recursive-include doc *
 -recursive-include bin *xml *xsl *sql *rml *sxw *csv *rng
 -graft bin/addons
 -global-exclude *pyc *~
 +recursive-include pixmaps *bmp *ico *png
 +recursive-include win32 *.py *.bat
 +recursive-include openerp *css *csv *html *png *po *pot
 +recursive-include openerp *rml *rng *sql *sxw *xml *xsl *yml
 +graft doc
 +global-exclude *pyc *~    # Exclude possible garbage from previous graft.