merge
authorFabien Pinckaers <fp@tinyerp.com>
Tue, 24 Aug 2010 12:37:54 +0000 (14:37 +0200)
committerFabien Pinckaers <fp@tinyerp.com>
Tue, 24 Aug 2010 12:37:54 +0000 (14:37 +0200)
bzr revid: fp@tinyerp.com-20100824123754-qi28qo3x5kz6akuq


Trivial merge