[MERGE]
authorJni (Open ERP) <jni@tinyerp.com>
Thu, 11 Nov 2010 07:27:15 +0000 (12:57 +0530)
committerJni (Open ERP) <jni@tinyerp.com>
Thu, 11 Nov 2010 07:27:15 +0000 (12:57 +0530)
commit259c64c46326e52b2561c175798faad8b8834c77
tree090ea2fa7af0685a40d7c5985b01543928f197b0
parentb7e0770faad1fb3d52ddf103baf583bc2ce26205
parent9e785c262565a039f700f0fb437871780496d980
[MERGE]

bzr revid: jni@tinyerp.com-20101111072715-74x5d496en1pmso2