mege
authorFabien Pinckaers <fp@tinyerp.com>
Fri, 2 Apr 2010 07:52:04 +0000 (09:52 +0200)
committerFabien Pinckaers <fp@tinyerp.com>
Fri, 2 Apr 2010 07:52:04 +0000 (09:52 +0200)
bzr revid: fp@tinyerp.com-20100402075204-n4ksug478o6t0uii


Trivial merge