merge
authorFabien Pinckaers <fp@tinyerp.com>
Wed, 7 Apr 2010 12:24:05 +0000 (14:24 +0200)
committerFabien Pinckaers <fp@tinyerp.com>
Wed, 7 Apr 2010 12:24:05 +0000 (14:24 +0200)
commit1d5311d60d00ad234a8f20a15bb23cb54ae2e49b
tree622e68fb6ea0024ca33acc2e30895560e7de09ad
parentc51fc012869693c23bdd905dd74c8527e7b12386
parent1cad6127507dd353e1d96a9a50d2b1159296fd67
merge

bzr revid: fp@tinyerp.com-20100407122405-iaorok5aedo74ojy