[MERGE]

author niv-openerp <nicolas.vanhoren@openerp.com>

Wed, 27 Apr 2011 14:37:23 +0000 (16:37 +0200)

committer niv-openerp <nicolas.vanhoren@openerp.com>

Wed, 27 Apr 2011 14:37:23 +0000 (16:37 +0200)
author niv-openerp <nicolas.vanhoren@openerp.com>
Wed, 27 Apr 2011 14:37:23 +0000 (16:37 +0200)
committer niv-openerp <nicolas.vanhoren@openerp.com>
Wed, 27 Apr 2011 14:37:23 +0000 (16:37 +0200)
diff --cc addons/base/static/src/js/data.js
Simple merge
diff --cc addons/base/static/src/js/form.js
Simple merge
diff --cc addons/base/static/src/xml/base.xml
Simple merge
author	niv-openerp <nicolas.vanhoren@openerp.com>
	Wed, 27 Apr 2011 14:37:23 +0000 (16:37 +0200)
committer	niv-openerp <nicolas.vanhoren@openerp.com>
	Wed, 27 Apr 2011 14:37:23 +0000 (16:37 +0200)
		1	2
addons/base/static/src/js/data.js	patch \|	diff1 \|	diff2 \|	blob \| history
addons/base/static/src/js/form.js	patch \|	diff1 \|	diff2 \|	blob \| history
addons/base/static/src/xml/base.xml	patch \|	diff1 \|	diff2 \|	blob \| history