merge
authorFabien Pinckaers <fp@tinyerp.com>
Tue, 1 Sep 2009 19:00:06 +0000 (21:00 +0200)
committerFabien Pinckaers <fp@tinyerp.com>
Tue, 1 Sep 2009 19:00:06 +0000 (21:00 +0200)
bzr revid: fp@tinyerp.com-20090901190006-i2tjwcrl71vnm2kv


Trivial merge