[MERGE]
authorUjjvala Collins (OpenERP) <uco@tinyerp.com>
Tue, 24 May 2011 13:35:24 +0000 (19:05 +0530)
committerUjjvala Collins (OpenERP) <uco@tinyerp.com>
Tue, 24 May 2011 13:35:24 +0000 (19:05 +0530)
bzr revid: uco@tinyerp.com-20110524133524-fhtgzbknh1wa9ypi

1  2 
addons/account_asset/account_asset.py
addons/account_asset/account_asset_view.xml

Simple merge