merge
authorFabien Pinckaers <fp@tinyerp.com>
Thu, 27 Nov 2008 09:07:56 +0000 (10:07 +0100)
committerFabien Pinckaers <fp@tinyerp.com>
Thu, 27 Nov 2008 09:07:56 +0000 (10:07 +0100)
commit327c384434b9cfef940860909f86138e727b1a93
treebeac41ddb93254e83ba24e416bd820733f0e6b21
parent59f316df19a7209f2fd2e9a743eed28fddc4f1bd
parentb9862d5b6cd3c09f82fd74efbac985995a32c8e9
merge

bzr revid: fp@tinyerp.com-20081127090756-3154j9t2wak4ot6x