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)
commit4fed4f0ccccc55c9e183eda6a81e068b67c63a69
treebaadca9c5232f4133c7285f5e8c9fcc3bb0797fe
parent52479838802ee368876f0a55c2400ccd96308ee0
parent3d81d17398bb6f34c1f4a67bce94d117939eedb3
merge

bzr revid: fp@tinyerp.com-20111221215646-3jf6sv9feu7qli11