merge from rhubarb
authorPaul Brossier <piem@piem.org>
Wed, 7 Nov 2007 16:21:00 +0000 (17:21 +0100)
committerPaul Brossier <piem@piem.org>
Wed, 7 Nov 2007 16:21:00 +0000 (17:21 +0100)
commit18a82b345c00ce71e790ee2b119485dfbc309ae4
treecf57c73f9cc4b61a356daa419679bb23b67efb5f
parent4b6937b60f42819270033ab16d7949ac507461a0
parentb050e8e67ce54dad93add48e1a4549470cfc07bd
merge from rhubarb