merge upstream
authorChristophe Simonis <chs@openerp.com>
Wed, 24 Oct 2012 11:48:31 +0000 (13:48 +0200)
committerChristophe Simonis <chs@openerp.com>
Wed, 24 Oct 2012 11:48:31 +0000 (13:48 +0200)
commit9dffee052265680d3e4939d37272a9c0ef713728
tree8dfc17615be27da2f3681fc60f4955dc057ac478
parentc1d67819ee9235566d0778db97edc96839072167
parentaebe743964575c9d9a90b8e6dbcd2d7efd4b4db8
merge upstream

bzr revid: chs@openerp.com-20121024114831-5eyxqxd7y066v30d
openerp/addons/base/module/module.py