[MERGE]Merge trunk-website-al.
authorbth-openerp <bth@tinyerp.com>
Thu, 24 Oct 2013 13:05:19 +0000 (18:35 +0530)
committerbth-openerp <bth@tinyerp.com>
Thu, 24 Oct 2013 13:05:19 +0000 (18:35 +0530)
bzr revid: bth@tinyerp.com-20131024130519-atsk50w40enrx85s


Trivial merge