merge
authorFabien Pinckaers <fp@tinyerp.com>
Thu, 20 Aug 2009 15:29:49 +0000 (17:29 +0200)
committerFabien Pinckaers <fp@tinyerp.com>
Thu, 20 Aug 2009 15:29:49 +0000 (17:29 +0200)
commite09353891cce38b81d1f0c207467236480a6874e
tree4fc41d83176b5cbd8ee0555a98edc5541688d10e
parent7b8afc298a9dc9f35b4dd1594892ea4ea6e0605b
parent6a05a3c77877d46637ad1eac00886f10a2f14be9
merge

bzr revid: fp@tinyerp.com-20090820152949-39r5gbnry3rr8gym