merge upstream
authorChristophe Simonis <chs@openerp.com>
Thu, 8 Nov 2012 16:46:52 +0000 (17:46 +0100)
committerChristophe Simonis <chs@openerp.com>
Thu, 8 Nov 2012 16:46:52 +0000 (17:46 +0100)
commitc71f018440a39b0c8903c5e0c5b5d178defe27f2
tree3f869ed5910f0d89d9822ad26672f9b6365daa1e
parent7ea98f28d788ab11b5f6a0f0fa0c210c3fa32d31
parent21af7835e090f8b0e80f59de04915d5f49ddd8e8
merge upstream

bzr revid: chs@openerp.com-20121108164652-bpsb0h2dfla62jqo