[MERGE] MERGE with lp:openobject-addons
authorBhumika (OpenERP) <sbh@tinyerp.com>
Thu, 14 Apr 2011 08:35:11 +0000 (14:05 +0530)
committerBhumika (OpenERP) <sbh@tinyerp.com>
Thu, 14 Apr 2011 08:35:11 +0000 (14:05 +0530)
commit60db4ddea08a085221308938694271c311e58c29
treed7244939ae56709df3103829b2a7257b525f69a6
parent49618746f8eb2f1b932831430b49c69665cc1823
parentad0ececa4e84b6abb4e1ba0a7eb96dd31904a9be
[MERGE] MERGE with lp:openobject-addons

bzr revid: sbh@tinyerp.com-20110408063210-n9tuturaedxk6qab
bzr revid: sbh@tinyerp.com-20110414083511-2boiio4zie8elu7c