merge
authorFabien Pinckaers <fp@tinyerp.com>
Sat, 24 Sep 2011 09:30:09 +0000 (11:30 +0200)
committerFabien Pinckaers <fp@tinyerp.com>
Sat, 24 Sep 2011 09:30:09 +0000 (11:30 +0200)
bzr revid: fp@tinyerp.com-20110924093009-bc2klcpkb2iin4tw


Trivial merge