merge
authorFabien Pinckaers <fp@tinyerp.com>
Wed, 24 Dec 2008 14:43:44 +0000 (15:43 +0100)
committerFabien Pinckaers <fp@tinyerp.com>
Wed, 24 Dec 2008 14:43:44 +0000 (15:43 +0100)
bzr revid: fp@tinyerp.com-20081224144344-usl5kga9nkg37wn4


Trivial merge