[MERGE] merge from dev3
authorARA (OpenERP) <ara@tinyerp.com>
Wed, 29 Dec 2010 10:06:51 +0000 (15:36 +0530)
committerARA (OpenERP) <ara@tinyerp.com>
Wed, 29 Dec 2010 10:06:51 +0000 (15:36 +0530)
commita6d43f1b9048cedb8cebce8a9b0500d23574d907
tree0dc621fef65f2fce84ee1db624dcf753d90cf7aa
parenta21255d9d760ec6fdc57a77b4ccc8a763ffb0593
parentab401b3788b35a548a947086885a27f68dcbb78c
[MERGE] merge from dev3

bzr revid: ara@tinyerp.com-20101229100651-jg88qzm39f381jrn