[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)
bzr revid: aag@tinyerp.co.in-20110328115414-effjwin4lmjtvtoq


Trivial merge