merge
authorFabien Pinckaers <fp@tinyerp.com>
Fri, 2 Apr 2010 12:54:33 +0000 (14:54 +0200)
committerFabien Pinckaers <fp@tinyerp.com>
Fri, 2 Apr 2010 12:54:33 +0000 (14:54 +0200)
commit4404619ef9f3bcb2adb285466d32b9a40affc0d1
tree08bb0df8f2f103bb22bb690e063991284640bcfd
parent4f09c9ffa5ef1c45b8480d17fe4af72f74f6edcd
parent32d41097f6f7a5b8750f24ceb834653b4877fce1
merge

bzr revid: fp@tinyerp.com-20100402125433-vznpij1lakg0e5g0