Merge with trunk

author RGA(OpenERP) <>

Tue, 24 Jul 2012 05:35:06 +0000 (11:05 +0530)

committer RGA(OpenERP) <>

Tue, 24 Jul 2012 05:35:06 +0000 (11:05 +0530)
author RGA(OpenERP) <>
Tue, 24 Jul 2012 05:35:06 +0000 (11:05 +0530)
committer RGA(OpenERP) <>
Tue, 24 Jul 2012 05:35:06 +0000 (11:05 +0530)
diff --cc addons/account/account_move_line.py
Simple merge
diff --cc addons/account/account_view.xml
Simple merge
		1	2
addons/account/account_move_line.py	patch \|	diff1 \|	diff2 \|	blob \| history
addons/account/account_view.xml	patch \|	diff1 \|	diff2 \|	blob \| history