merge
authorFabien Pinckaers <fp@tinyerp.com>
Sun, 16 Aug 2009 20:18:55 +0000 (22:18 +0200)
committerFabien Pinckaers <fp@tinyerp.com>
Sun, 16 Aug 2009 20:18:55 +0000 (22:18 +0200)
commit40600e56ba5366fa9b9dce4abc36310e81147b0c
tree5efe7b81df707baa6d0bce9c7e67146dbe39373c
parentc8212d8ac05ffb5be0e0ce0686909e6cd0eec63c
parent59e5081a0d5e6a5e15cf956b99e038f51bf382da
merge

bzr revid: fp@tinyerp.com-20090816201855-ylrhdctcpgtuivlf