merge
authorFabien Pinckaers <fp@tinyerp.com>
Thu, 26 Aug 2010 08:31:59 +0000 (10:31 +0200)
committerFabien Pinckaers <fp@tinyerp.com>
Thu, 26 Aug 2010 08:31:59 +0000 (10:31 +0200)
commitdafba0d2ea339f0e99a1b3dc2614eeda85933600
tree75b875e01fcac47ec4b0799ba376459e91c2d54e
parent9e3b744de402418213c8b5a86aa0c64a6a939496
parent3971b7a55a578532cf6eb9abdbec7d8cad411d8e
merge

bzr revid: fp@tinyerp.com-20100826083159-srj5zef3swu7250m