[Merge]
authorVir (Open ERP) <vir@tinyerp.com>
Thu, 23 Sep 2010 04:36:20 +0000 (10:06 +0530)
committerVir (Open ERP) <vir@tinyerp.com>
Thu, 23 Sep 2010 04:36:20 +0000 (10:06 +0530)
bzr revid: vir@tinyerp.com-20100917132957-h8yfsd3iwx58vd0n
bzr revid: amp@tinyerp.com-20100918054229-bhtpkyw60yep2adh
bzr revid: vir@tinyerp.com-20100920043115-duutcwjen1bi64ll
bzr revid: vir@tinyerp.com-20100920092311-6btq951zzucvdvju
bzr revid: vir@tinyerp.com-20100921045650-jd5aclm7t825o6hj
bzr revid: vir@tinyerp.com-20100922043254-z7ev282pd9sp4off
bzr revid: vir@tinyerp.com-20100923043620-faanprzedvdrmd3f


Trivial merge