merge
authorFabien Pinckaers <fp@tinyerp.com>
Tue, 7 Oct 2008 20:05:01 +0000 (22:05 +0200)
committerFabien Pinckaers <fp@tinyerp.com>
Tue, 7 Oct 2008 20:05:01 +0000 (22:05 +0200)
commit8e70f5d37fb8bdac19bbff294aff3547e17680f8
treeb36495b4c3c01028241eac865f81ac6569cb2292
parente926aa339079f081cf4d3bfa4f10fbfe703e896d
parentcf9fa4629d4a45b914a6e2decf6ce18df1646c12
merge

bzr revid: fp@tinyerp.com-20081007200501-h7guwri314im0z7z