[MERGE] merge from dev3
authorARA (OpenERP) <ara@tinyerp.com>
Thu, 9 Dec 2010 12:56:17 +0000 (18:26 +0530)
committerARA (OpenERP) <ara@tinyerp.com>
Thu, 9 Dec 2010 12:56:17 +0000 (18:26 +0530)
bzr revid: ara@tinyerp.com-20101209125617-bze3t7fr7vru5sj0


Trivial merge