[MERGE] merge with team1 branch
authorSbh (OpenERP) <sbh@tinyerp.com>
Wed, 15 Dec 2010 06:30:57 +0000 (12:00 +0530)
committerSbh (OpenERP) <sbh@tinyerp.com>
Wed, 15 Dec 2010 06:30:57 +0000 (12:00 +0530)
commit481d1a516b2b9e4a1ec87caea021aa293ec6f930
tree5c88ff74e470153b97d74838c8ce5761533645e3
parent85aecd5eee8c28a884d4ae99c29a8a9b06787871
parent9bcfd67d8133c3c0294887efb51fe1960179ad33
[MERGE] merge with team1 branch

bzr revid: sbh@tinyerp.com-20101215063057-8x4icuelo0ejotnk