merge
authorFabien Pinckaers <fp@tinyerp.com>
Mon, 16 Mar 2009 18:07:59 +0000 (19:07 +0100)
committerFabien Pinckaers <fp@tinyerp.com>
Mon, 16 Mar 2009 18:07:59 +0000 (19:07 +0100)
commit0ea23ab638bc42faa6c9c7a711605fabfe6634f8
tree37c0bd128c51ccfbc14eff66da6132bec3eb4aaf
parent8aee423c9f25b0c35a1a7131a4c69b3c2dc8bbc6
parentf0fd524ff2481bd39a0564d3f61f232aa2cfc659
merge

bzr revid: fp@tinyerp.com-20090316180759-qb3u1hh3juph777j