merge
authorFabien Pinckaers <fp@tinyerp.com>
Mon, 28 Sep 2009 14:26:44 +0000 (16:26 +0200)
committerFabien Pinckaers <fp@tinyerp.com>
Mon, 28 Sep 2009 14:26:44 +0000 (16:26 +0200)
bzr revid: fp@tinyerp.com-20090928142644-j16l08v5q3qzqaf3


Trivial merge