[MERGE] merge from dev3
authorARA (OpenERP) <ara@tinyerp.com>
Mon, 24 Jan 2011 13:24:36 +0000 (18:54 +0530)
committerARA (OpenERP) <ara@tinyerp.com>
Mon, 24 Jan 2011 13:24:36 +0000 (18:54 +0530)
bzr revid: ara@tinyerp.com-20110124132436-agnh3snu83g94cm0


Trivial merge