merge
authorFabien Pinckaers <fp@tinyerp.com>
Sat, 17 Sep 2011 12:41:30 +0000 (14:41 +0200)
committerFabien Pinckaers <fp@tinyerp.com>
Sat, 17 Sep 2011 12:41:30 +0000 (14:41 +0200)
bzr revid: fp@tinyerp.com-20110917124130-fmi66yut5gymv5ze


Trivial merge