[MERGE]Merge lp:~openerp-dev/openobject-addons/trunk-website-al.
authorbth-openerp <bth@tinyerp.com>
Mon, 26 Aug 2013 06:02:43 +0000 (11:32 +0530)
committerbth-openerp <bth@tinyerp.com>
Mon, 26 Aug 2013 06:02:43 +0000 (11:32 +0530)
bzr revid: bth@tinyerp.com-20130826060243-3yhxlioyv3bgkikd


Trivial merge