[MERGE] Merged RGO's branch for the fix of wrong _defaults on stock module
authorJay Vora (OpenERP) <jvo@tinyerp.com>
Tue, 31 May 2011 09:20:57 +0000 (14:50 +0530)
committerJay Vora (OpenERP) <jvo@tinyerp.com>
Tue, 31 May 2011 09:20:57 +0000 (14:50 +0530)
bzr revid: jvo@tinyerp.com-20110531092057-s538la6zhvarsj8h


Trivial merge