[MERGE]Merge trunk-website-al.
authorbth-openerp <bth@tinyerp.com>
Thu, 24 Oct 2013 05:15:43 +0000 (10:45 +0530)
committerbth-openerp <bth@tinyerp.com>
Thu, 24 Oct 2013 05:15:43 +0000 (10:45 +0530)
bzr revid: bth@tinyerp.com-20131024051543-zow19or2yqh5kczn


Trivial merge