[MERGE]
authorChristophe Simonis <christophe@tinyerp.com>
Wed, 12 Aug 2009 09:31:04 +0000 (11:31 +0200)
committerChristophe Simonis <christophe@tinyerp.com>
Wed, 12 Aug 2009 09:31:04 +0000 (11:31 +0200)
commit385cd245ef6959ddd12a64566c31acfed54f8c30
tree3e8b5a1b937450a6e0031b5965f76f818b77fad3
parenta14e372744e771a7c5ebc6a2a04e32308838e105
parent02c55475622bfaf0b06e00995472e6ee94bac153
[MERGE]

bzr revid: christophe@tinyerp.com-20090811141115-d5sy0wcp5tea6o53
bzr revid: christophe@tinyerp.com-20090812081203-lhman18vsrmhyepg
bzr revid: christophe@tinyerp.com-20090812093104-52gl73glxx90ix39