merge
authorFabien Pinckaers <fp@tinyerp.com>
Mon, 11 Jun 2012 09:08:02 +0000 (11:08 +0200)
committerFabien Pinckaers <fp@tinyerp.com>
Mon, 11 Jun 2012 09:08:02 +0000 (11:08 +0200)
commitd19aa69747864134ef5f8110b21afb6b85b6abdc
tree7c32471f881b326ce6e6b4eff6b12f38ee5d9fee
parent9a7573dd7f03d05103787f7950491a3334c8d37c
parent1e6ffa757020cb360f4dbf1a7d91612770c78947
merge

bzr revid: fp@tinyerp.com-20120611090802-a85fuvi9kkb15nju