[MERGE]
authoruco (Open ERP) <uco@tinyerp.com>
Wed, 15 Sep 2010 04:47:54 +0000 (10:17 +0530)
committeruco (Open ERP) <uco@tinyerp.com>
Wed, 15 Sep 2010 04:47:54 +0000 (10:17 +0530)
commitc8389209f28b1f74e467b2a11824770e2e0a748a
tree0bac92f4ed0c657c24dd73da83fbcb55c20eba9b
parentf070bfd61e1f775f1b4cd61406c9a72f5bda7ba1
parent31bfb558931550b124d26a5d94eaebdb6c55daed
[MERGE]

bzr revid: uco@tinyerp.com-20100915044754-8k2e2bg0ghmk387a