merge
authorFabien Pinckaers <fp@tinyerp.com>
Mon, 16 Mar 2009 18:07:59 +0000 (19:07 +0100)
committerFabien Pinckaers <fp@tinyerp.com>
Mon, 16 Mar 2009 18:07:59 +0000 (19:07 +0100)
bzr revid: fp@tinyerp.com-20090316180759-qb3u1hh3juph777j


Trivial merge