merge
authorFabien Pinckaers <fp@tinyerp.com>
Fri, 26 Sep 2008 09:26:15 +0000 (11:26 +0200)
committerFabien Pinckaers <fp@tinyerp.com>
Fri, 26 Sep 2008 09:26:15 +0000 (11:26 +0200)
commit7c9309fe23db968b48298db4d0602b00a771c72c
tree176f5a939233ce0042399fc711420c5a55b3e8d9
parentf824dd39107d6ec6c624d6d9bb4934a1639b8aa8
parent80debb8028836119ffa559d880b79d841933db2e
merge

bzr revid: fp@tinyerp.com-20080926092615-u0ldbo3evisg8h38