[MERGE] Merged with main web.
bzr revid: tde@openerp.com-
20120611083449-fjcy5injx0wydrlm
bzr revid: tde@openerp.com-
20120612074745-zmfq9i0h3gcqz2z1
bzr revid: tde@openerp.com-
20120613153033-8yhiis0mk7a91rfu
bzr revid: tde@openerp.com-
20120614083859-eo4gpuvxuqhw9ob1
bzr revid: tde@openerp.com-
20120615081833-tyv0wl56wcppwstp
bzr revid: tde@openerp.com-
20120618075747-tvealk8do8h1sigb
bzr revid: tde@openerp.com-
20120619073535-rgleb9j9g5xy2xeg
bzr revid: tde@openerp.com-
20120620073852-xatt6u4855i5g681
bzr revid: tde@openerp.com-
20120621081613-hfu05ia738euiarr