[MERGE] trunk
authorFabien Pinckaers <fp@tinyerp.com>
Thu, 11 Oct 2012 08:19:08 +0000 (10:19 +0200)
committerFabien Pinckaers <fp@tinyerp.com>
Thu, 11 Oct 2012 08:19:08 +0000 (10:19 +0200)
commit914498d2ff25ca8f41ad8e9918d65b7377d866e3
tree6cdef3a795f8a08f8674ac6a0b8fe388fa085f5e
parentca6f593527e9246c54964becd0bce6a65f16d781
parentfc94df2af5146d2780da3b07bf1fad78e6831889
[MERGE] trunk

bzr revid: fp@tinyerp.com-20121011081908-fu1don49seb3loro