[MERGED] already merged
authorFabien Pinckaers <fp@tinyerp.com>
Mon, 26 Nov 2012 12:14:45 +0000 (13:14 +0100)
committerFabien Pinckaers <fp@tinyerp.com>
Mon, 26 Nov 2012 12:14:45 +0000 (13:14 +0100)
bzr revid: fp@tinyerp.com-20121126121445-23cjq8dhsd5qso9h


Trivial merge