[MERGE]merge with latest addons_trunk
authorCedric Snauwaert <csn@openerp.com>
Fri, 2 Nov 2012 10:45:49 +0000 (11:45 +0100)
committerCedric Snauwaert <csn@openerp.com>
Fri, 2 Nov 2012 10:45:49 +0000 (11:45 +0100)
bzr revid: csn@openerp.com-20121102104549-qqy8ud6nduvpyee6

1  2 
addons/account_asset/account_asset.py

Simple merge