[MERGE] Merge from main trunk addons
authorJMA (OpenERP) <jma@tinyerp.com>
Tue, 12 Oct 2010 11:20:22 +0000 (16:50 +0530)
committerJMA (OpenERP) <jma@tinyerp.com>
Tue, 12 Oct 2010 11:20:22 +0000 (16:50 +0530)
commit1b49d361586752e7d8c51d3ebda661822ab836e2
tree4561875fb0d9489a6372d0610976a1f575f848a9
parent54f0a7dbf5e1c68d551320a2095f25edd5fbd54d
parent499793ae415ffd183fcec068b93362428e74d498
[MERGE] Merge from main trunk addons

bzr revid: jma@tinyerp.com-20101012112022-gzfkpd10vu06ziss