merge of 'b0e8a7b18bc538b2926b839a1a3adad6234a53e0'
authorPhilip Balister <philip@balister.org>
Sun, 11 Mar 2007 18:39:19 +0000 (18:39 +0000)
committerPhilip Balister <philip@balister.org>
Sun, 11 Mar 2007 18:39:19 +0000 (18:39 +0000)
     and 'bfad7eb7e40db9284b9271f1a40a8fa4ec870886'


Trivial merge