merge
authorFabien Pinckaers <fp@tinyerp.com>
Thu, 27 Nov 2008 14:59:22 +0000 (15:59 +0100)
committerFabien Pinckaers <fp@tinyerp.com>
Thu, 27 Nov 2008 14:59:22 +0000 (15:59 +0100)
bzr revid: fp@tinyerp.com-20081127145922-coxpmk4ywm9kzt80


Trivial merge