[MERGE]
authorAmit Patel (OpenERP) <apa@tinyerp.com>
Tue, 20 Mar 2012 09:35:17 +0000 (15:05 +0530)
committerAmit Patel (OpenERP) <apa@tinyerp.com>
Tue, 20 Mar 2012 09:35:17 +0000 (15:05 +0530)
commit1a16e1c3f95745f2ab992fffae603d25949bbbbb
treeb467767de5ef7a0cfbfce620291deef06cae1384
parent5188e3c16372fd4bee858ca23ce6d750978ced3e
parentefa32c3ed1ee987a320c7dd0510f60ad2360e5e2
[MERGE]

bzr revid: apa@tinyerp.com-20120320093517-p3v5pgl9hjs083ao