merge from stw
authorFrédéric van der Essen <fva@openerp.com>
Wed, 9 May 2012 09:46:36 +0000 (11:46 +0200)
committerFrédéric van der Essen <fva@openerp.com>
Wed, 9 May 2012 09:46:36 +0000 (11:46 +0200)
commitc2bb090836be5d7b34ba674bb32ceafd6f3132f4
treece625cada1dd9e38d1e30bbab115f78fefc1dcf6
parent8a09bcf83ece18505a343ebbc5c6d6b3e98c7a4c
parentca2db3740e8b8306c0a5567c12b535b3c27396ee
merge from stw

bzr revid: fva@openerp.com-20120509094636-kqlmd9gf6y33ehn1