merge_trunk
authorFabien Pinckaers <fp@tinyerp.com>
Fri, 13 Jul 2012 11:53:45 +0000 (13:53 +0200)
committerFabien Pinckaers <fp@tinyerp.com>
Fri, 13 Jul 2012 11:53:45 +0000 (13:53 +0200)
bzr revid: fp@tinyerp.com-20120713115345-nfvg7sraq6cmhrno


Trivial merge