merge of '8f996463a60dbfcc7f4d2c5d595f26e0e2bdb241'
authorPhilip Balister <philip@balister.org>
Fri, 4 Jul 2008 13:27:42 +0000 (13:27 +0000)
committerPhilip Balister <philip@balister.org>
Fri, 4 Jul 2008 13:27:42 +0000 (13:27 +0000)
     and 'f5868314ec3adec0707c1ac080a62e860e2ef3ed'


Trivial merge