[MERGE] Sync with trunk.
authorThibault Delavallée <tde@openerp.com>
Fri, 21 Dec 2012 10:03:20 +0000 (11:03 +0100)
committerThibault Delavallée <tde@openerp.com>
Fri, 21 Dec 2012 10:03:20 +0000 (11:03 +0100)
commit5b3fc4061ba0c84f7e0ff466c4d7025f9cfa44e9
treed07f2c5bb9ec0ce018b824f91caa5f6f1da9c090
parent919c0d1152ba869af49e4d9186698d35dbb89541
parent73cb6d5321cc71d85456e6f6e61fc34b79b95c16
[MERGE] Sync with trunk.

bzr revid: tde@openerp.com-20121221100320-ntn6zsdcqlvz52xn