[MERGE] Sync with trunk.
authorThibault Delavallée <tde@openerp.com>
Fri, 22 Mar 2013 09:09:51 +0000 (10:09 +0100)
committerThibault Delavallée <tde@openerp.com>
Fri, 22 Mar 2013 09:09:51 +0000 (10:09 +0100)
commit93eaf80e068109cf4d6cb34ffd8eb1eb2ae3e90c
treed6201aa5b671d6d402c0965776500655bf901e63
parent6d52a622627770c5685532ed964c148eae859f8f
parent6a696ba673f9d27f78490fdbbf5d899de21106b7
[MERGE] Sync with trunk.

bzr revid: tde@openerp.com-20130322090951-fvgcj1xyhtvwcciu