[MERGE] merge from dev3
authorARA (OpenERP) <ara@tinyerp.com>
Fri, 17 Dec 2010 13:17:32 +0000 (18:47 +0530)
committerARA (OpenERP) <ara@tinyerp.com>
Fri, 17 Dec 2010 13:17:32 +0000 (18:47 +0530)
commit3f05e8334757a55bce2d682ad53be30054dc39f3
tree98ebd022c9074b1f4abbc5d36eec48c8ecce37ec
parentf84571fb57a5fb0ef57612d75f5e51acdf93561c
parent4ab460046a1b20ccbbf45283925628126cb9fa6a
[MERGE] merge from dev3

bzr revid: ara@tinyerp.com-20101217131732-wb1ncg9vf2ah0fq2