[MERGE]
authorStephane Wirtel <stephane@tinyerp.com>
Thu, 29 Jan 2009 00:08:33 +0000 (01:08 +0100)
committerStephane Wirtel <stephane@tinyerp.com>
Thu, 29 Jan 2009 00:08:33 +0000 (01:08 +0100)
commit49e783c0245864ba8ba886b299b6a75898fbed02
tree0feecaf9d6ff9b89c5a5308138a8234cde2c8462
parent9b30b73b0833fb2f8612be8196438cd3f8def913
parent2fdc099da6e27874e6e844a8f5cb0cc1fb639869
[MERGE]

bzr revid: stephane@tinyerp.com-20090129000833-cm2c7l13z62q1ncj