[MERGE] Merged main branch
authorDHS (OpenERP) <dhs@tinyerp.com>
Tue, 26 Oct 2010 07:16:33 +0000 (12:46 +0530)
committerDHS (OpenERP) <dhs@tinyerp.com>
Tue, 26 Oct 2010 07:16:33 +0000 (12:46 +0530)
commit1a1197101fe74b49129818e5bd3cda42e80cad7f
treeb5e2d995a4895fd6cd652b76ddd412c736e4160f
parent015e3d3a34f0f56410294a47f1c81ecce4afce9d
parentbeae37adb04148470f41985c76e556b28de40d4b
[MERGE] Merged main branch

bzr revid: dhs@tinyerp.com-20101026071633-v9t8xjhwx71i4zwo