[MERGE] merge from dev3
authorARA (OpenERP) <ara@tinyerp.com>
Wed, 22 Dec 2010 11:24:32 +0000 (16:54 +0530)
committerARA (OpenERP) <ara@tinyerp.com>
Wed, 22 Dec 2010 11:24:32 +0000 (16:54 +0530)
commit36a998b4aeed000c90e73eb1109a7207832e6fe7
tree4835a00d2bd57d1f6012fe846adb606b136b62d7
parenta3ac0b2691056035dc00b0edd5aa93d7b2cf3b36
parent5311423522e6b9aeeddd1eb8441033a1dbb76054
[MERGE] merge from dev3

bzr revid: ara@tinyerp.com-20101222112432-ctqnlvaztjes6bal