merge
authorFabien Pinckaers <fp@tinyerp.com>
Fri, 8 Oct 2010 15:09:53 +0000 (17:09 +0200)
committerFabien Pinckaers <fp@tinyerp.com>
Fri, 8 Oct 2010 15:09:53 +0000 (17:09 +0200)
bzr revid: fp@tinyerp.com-20101008150953-zozwe24b14nbriga


Trivial merge