[MERGE]
authorChristophe Simonis <christophe@tinyerp.com>
Thu, 5 Feb 2009 14:03:44 +0000 (15:03 +0100)
committerChristophe Simonis <christophe@tinyerp.com>
Thu, 5 Feb 2009 14:03:44 +0000 (15:03 +0100)
commit47faac97372f09bc4b2f4da13f4dfc2a85e47df8
tree14950fa9445e0a974d65c48c2f482b72cc55ae6f
parenteed8260fda4f71c1dc59b276db1480c414828116
parent1ea82dc87e6e9b5995b364bed8af79304d9408c2
[MERGE]

bzr revid: christophe@tinyerp.com-20090205140344-06ej5dge0fxedbet