merge
authorFabien Pinckaers <fp@tinyerp.com>
Tue, 24 Aug 2010 06:34:34 +0000 (08:34 +0200)
committerFabien Pinckaers <fp@tinyerp.com>
Tue, 24 Aug 2010 06:34:34 +0000 (08:34 +0200)
bzr revid: fp@tinyerp.com-20100824063434-8bgl4nsbnfbggkbl


Trivial merge