[MERGE] Sync with trunk.
authorThibault Delavallée <tde@openerp.com>
Fri, 7 Dec 2012 09:33:50 +0000 (10:33 +0100)
committerThibault Delavallée <tde@openerp.com>
Fri, 7 Dec 2012 09:33:50 +0000 (10:33 +0100)
commitf810fb0526f9b143b45bbd7dd26df71c89a29f61
tree88bb15a7d64a607e6a3035298f45ba3e66493d9c
parentd588388ae4a33ee836e7ebbd0a764e3081d0bba5
parent595b9e2d855aaf3e4a1247c455b9a288d22e8c77
[MERGE] Sync with trunk.

bzr revid: tde@openerp.com-20121207093350-kinvhwjzgrmif4d6