merge from trunk
authorRGA (OpenERP) <rga@tinyerp.com>
Mon, 20 Sep 2010 10:23:11 +0000 (15:53 +0530)
committerRGA (OpenERP) <rga@tinyerp.com>
Mon, 20 Sep 2010 10:23:11 +0000 (15:53 +0530)
bzr revid: rga@tinyerp.com-20100920102311-elxge0e4wyx4af64


Trivial merge