merge
authorFabien Pinckaers <fp@tinyerp.com>
Thu, 27 Nov 2008 15:21:05 +0000 (16:21 +0100)
committerFabien Pinckaers <fp@tinyerp.com>
Thu, 27 Nov 2008 15:21:05 +0000 (16:21 +0100)
commitabddfdeba5b108048efd5e637b7d0311ec19e51c
tree98e7f0f1e1db83a2635be4480528851a938a0610
parent4f3c92e84f54c87f0fd254f225e1874a0ab2a3d8
parent69bd8e38e0f3d42cad1a787878a0a7d9c481c1ce
merge

bzr revid: fp@tinyerp.com-20081127152105-8i9i9eb37907491e