mergetrunk
authorFabien Pinckaers <fp@tinyerp.com>
Sat, 29 Sep 2012 13:15:40 +0000 (15:15 +0200)
committerFabien Pinckaers <fp@tinyerp.com>
Sat, 29 Sep 2012 13:15:40 +0000 (15:15 +0200)
bzr revid: fp@tinyerp.com-20120929131540-s5uj478yit74rx9g


Trivial merge