merge
authorFabien Pinckaers <fp@tinyerp.com>
Wed, 28 Jan 2009 08:54:51 +0000 (09:54 +0100)
committerFabien Pinckaers <fp@tinyerp.com>
Wed, 28 Jan 2009 08:54:51 +0000 (09:54 +0100)
commit4fced1e7449e65e7dc5d07e3c9f7d704372f9b5a
treea32f8a882d07f968a537e2edd3e8099d7b0c8732
parentb04a8baf03870a2f92a39bd7143e622930131923
parentd199f9346450a17d15cf1c9c858b9b8ede253053
merge

bzr revid: fp@tinyerp.com-20090128085451-dxsocjl7wc5sfm0m