[MERGE]Merge trunk-website-al.
authorbth-openerp <bth@tinyerp.com>
Wed, 23 Oct 2013 13:08:55 +0000 (18:38 +0530)
committerbth-openerp <bth@tinyerp.com>
Wed, 23 Oct 2013 13:08:55 +0000 (18:38 +0530)
bzr revid: bth@tinyerp.com-20131023130855-6rt6rip6x1h04xc5


Trivial merge