[MERGE] with trunk
authorArnaud Pineux <api@openerp.com>
Wed, 12 Dec 2012 12:05:52 +0000 (13:05 +0100)
committerArnaud Pineux <api@openerp.com>
Wed, 12 Dec 2012 12:05:52 +0000 (13:05 +0100)
bzr revid: api@openerp.com-20121212120552-gyimqlcgtg9stmm6


No differences found