[MERGE] Merged with server/trunk.
authorThibault Delavallée <tde@openerp.com>
Thu, 20 Sep 2012 07:49:32 +0000 (09:49 +0200)
committerThibault Delavallée <tde@openerp.com>
Thu, 20 Sep 2012 07:49:32 +0000 (09:49 +0200)
bzr revid: tde@openerp.com-20120920074932-7w0zb5o979wffom5


Trivial merge