merge
authorFabien Pinckaers <fp@tinyerp.com>
Wed, 21 Dec 2011 21:56:46 +0000 (22:56 +0100)
committerFabien Pinckaers <fp@tinyerp.com>
Wed, 21 Dec 2011 21:56:46 +0000 (22:56 +0100)
bzr revid: fp@tinyerp.com-20111221215646-3jf6sv9feu7qli11


Trivial merge