[MERGE]: Merged with trunk addons.
authorUjjvala Collins (OpenERP) <uco@tinyerp.com>
Fri, 24 Feb 2012 06:58:22 +0000 (12:28 +0530)
committerUjjvala Collins (OpenERP) <uco@tinyerp.com>
Fri, 24 Feb 2012 06:58:22 +0000 (12:28 +0530)
commit6ebf6708825690c4384e9f24975177e0a4357ecd
tree6e951ec073798100e05eba9fe00e6ed547f34e65
parenta5fba77a0d0ccf1ffe499f88d4e127c30b6ebbe3
parentc57c5c13cf50a8edee272045181ab48ead959a88
[MERGE]: Merged with trunk addons.

bzr revid: uco@tinyerp.com-20120224065822-iuwh20xxashjxnkj