[MERGE]: Merge with lp:openobject-addons
authorMayur Maheshwari (OpenERP) <mma@tinyerp.com>
Thu, 22 Sep 2011 10:31:29 +0000 (16:01 +0530)
committerMayur Maheshwari (OpenERP) <mma@tinyerp.com>
Thu, 22 Sep 2011 10:31:29 +0000 (16:01 +0530)
commit3029ca51957d514c28c96a793371a24b8619e549
tree651f40a09de921acb439ac0256a4dd891c243b99
parentf3376c8f9781d75e1b5c3fc9169fb48b2dd65679
parent4d18a8a61450e9f5beabd4993ba2df71125fb80e
[MERGE]: Merge with lp:openobject-addons

bzr revid: mma@tinyerp.com-20110922103129-tzi4x1952w46s2am