Merge trunk
Merge branch 'master' of bzr::lp:~openerp-dev/openobject-server/trunk-website-al into saas-3