[MERGE] Merge ara branch
authorSbh (Openerp) <sbh@tinyerp.com>
Wed, 6 Jun 2012 05:01:01 +0000 (10:31 +0530)
committerSbh (Openerp) <sbh@tinyerp.com>
Wed, 6 Jun 2012 05:01:01 +0000 (10:31 +0530)
bzr revid: sbh@tinyerp.com-20120606050101-8070jf7z5gab0urg


Trivial merge