[MERGE]
authorUjjvala Collins (OpenERP) <uco@tinyerp.com>
Tue, 24 May 2011 13:34:36 +0000 (19:04 +0530)
committerUjjvala Collins (OpenERP) <uco@tinyerp.com>
Tue, 24 May 2011 13:34:36 +0000 (19:04 +0530)
commit342a617f71c93586bb7c9c2a4346455ad8131cc3
tree62c2bbe7cd4911725be55438559b632dc107127c
parent26b3ffdf1d510f5b266a743fadcf7b23285a6248
parentfc570afb359a44245e26c21f5a6a9b3b13e71cde
[MERGE]

bzr revid: uco@tinyerp.com-20110524133436-zxzoem4c3thg3htf
addons/account_asset/account_asset.py
addons/account_asset/account_asset_view.xml