[MERGE] Update setup.py to properly package docutils data for Windows + reorder Setti...
authorOlivier Dony <odo@openerp.com>
Thu, 17 Jan 2013 10:21:02 +0000 (11:21 +0100)
committerOlivier Dony <odo@openerp.com>
Thu, 17 Jan 2013 10:21:02 +0000 (11:21 +0100)
bzr revid: odo@openerp.com-20130117102102-9arm888hx5vaiunn


Trivial merge