[MERGE] merge from dev3
authorARA (OpenERP) <ara@tinyerp.com>
Wed, 16 Feb 2011 05:04:06 +0000 (10:34 +0530)
committerARA (OpenERP) <ara@tinyerp.com>
Wed, 16 Feb 2011 05:04:06 +0000 (10:34 +0530)
bzr revid: ara@tinyerp.com-20110216050406-47dez203s9f4j3ef


Trivial merge