[MERGE] 20 merge props
authorFabien Pinckaers <fp@tinyerp.com>
Tue, 13 Nov 2012 08:56:28 +0000 (09:56 +0100)
committerFabien Pinckaers <fp@tinyerp.com>
Tue, 13 Nov 2012 08:56:28 +0000 (09:56 +0100)
bzr revid: fp@tinyerp.com-20121113085628-a20qtouxxw7gh98b


Trivial merge