merge
authorFabien Pinckaers <fp@tinyerp.com>
Mon, 3 Nov 2008 12:47:07 +0000 (13:47 +0100)
committerFabien Pinckaers <fp@tinyerp.com>
Mon, 3 Nov 2008 12:47:07 +0000 (13:47 +0100)
commit90692d975b24e00f166c87f6deaba6e2efd261b8
tree862402aa766ae3ff5f739db0c8b61a4ee6367e6a
parent4628a270c88c128a82e1dc9f72e2818f05e03342
parent5d76eef2a9d92aeb7bbd66e4f17c8f29bedb3542
merge

bzr revid: fp@tinyerp.com-20081103124707-zxpsook64177u45n