[MERGE]: Merge with lp:trunk-configuration-rework
authoraag (OpenERP) <aag@tinyerp.co.in>
Mon, 28 Mar 2011 11:54:14 +0000 (17:24 +0530)
committeraag (OpenERP) <aag@tinyerp.co.in>
Mon, 28 Mar 2011 11:54:14 +0000 (17:24 +0530)
commit4bab65ad54866b391c89a4f07d359289dd6094ce
treeebddd4b2bcec247766e168ce798ca8b687144c54
parent40fd149a4aca022b30579305ab466d2b791f7816
parentc7fdae6fc8e3d990294b0a33fb57d7b1ee85ec27
[MERGE]: Merge with lp:trunk-configuration-rework

bzr revid: aag@tinyerp.co.in-20110328115414-effjwin4lmjtvtoq