[MERGE]
authorJni (Open ERP) <jni@tinyerp.com>
Tue, 2 Nov 2010 06:27:56 +0000 (11:57 +0530)
committerJni (Open ERP) <jni@tinyerp.com>
Tue, 2 Nov 2010 06:27:56 +0000 (11:57 +0530)
bzr revid: jni@tinyerp.com-20101102062756-9bqdd7y6byelwy63


Trivial merge