merge
authorFabien Pinckaers <fp@tinyerp.com>
Fri, 11 Nov 2011 13:46:12 +0000 (14:46 +0100)
committerFabien Pinckaers <fp@tinyerp.com>
Fri, 11 Nov 2011 13:46:12 +0000 (14:46 +0100)
bzr revid: fp@tinyerp.com-20111111134612-e1wuecwk9v79qqbn

1  2 
addons/resource/resource.py

Simple merge