merge of '1cdc457f64f3451940bcf06c52bbc5dd90e86a1e'
authorPhilip Balister <philip@balister.org>
Fri, 3 Aug 2007 14:40:38 +0000 (14:40 +0000)
committerPhilip Balister <philip@balister.org>
Fri, 3 Aug 2007 14:40:38 +0000 (14:40 +0000)
     and '6897ab6243e36c667763f309198c961dba118378'


Trivial merge