[MERGE] from trunk
authorChristophe Matthieu <chm@openerp.com>
Thu, 20 Dec 2012 14:25:30 +0000 (15:25 +0100)
committerChristophe Matthieu <chm@openerp.com>
Thu, 20 Dec 2012 14:25:30 +0000 (15:25 +0100)
commit1834be63f6da08ccd98f1f3cba418aa2ee3d83cd
tree0fc34e25138e014d748f43fae5d4a4782f465e2b
parent79308644c9b5e571be3d82cc88a826afff2332f4
parentedc064dba14335359f4ca5c4eeba83769d6ea569
[MERGE] from trunk

bzr revid: chm@openerp.com-20121220142530-rl01iml4smyv3r4n