merge
authorFabien Pinckaers <fp@tinyerp.com>
Fri, 11 Nov 2011 13:54:14 +0000 (14:54 +0100)
committerFabien Pinckaers <fp@tinyerp.com>
Fri, 11 Nov 2011 13:54:14 +0000 (14:54 +0100)
bzr revid: fp@tinyerp.com-20111111135414-2qk32ep1pbbco41v


Trivial merge