[MERGE] merge with lp:openobject-addons
authorYsa (Open ERP) <ysa@tinyerp.co.in>
Tue, 27 Apr 2010 05:07:53 +0000 (10:37 +0530)
committerYsa (Open ERP) <ysa@tinyerp.co.in>
Tue, 27 Apr 2010 05:07:53 +0000 (10:37 +0530)
commitd7a06f870cff55e9b25b0ebad9b7e3df6ca8a611
tree7ea91ab2393f9bd0011e9d45d32fddada374f92e
parent7ec9f3a321bde5f191e67e3bc66d79c31d58c1df
parent1864724d6cd498cbe3fe2a2dba0eae6dac017c54
[MERGE] merge with lp:openobject-addons

bzr revid: ysa@tinyerp.co.in-20100427050753-z3oxyq3371xrf919