[MERGE] Merge document chagnes
authorSbh (Openerp) <sbh@tinyerp.com>
Thu, 14 Jun 2012 07:01:34 +0000 (12:31 +0530)
committerSbh (Openerp) <sbh@tinyerp.com>
Thu, 14 Jun 2012 07:01:34 +0000 (12:31 +0530)
bzr revid: sbh@tinyerp.com-20120614070134-2to8qgr8cx1y2vux


Trivial merge