merge of '47c01740d6df38376dfcb0407a0b42bb05e60a2b'
authorRod Whitby <rod@whitby.id.au>
Sat, 2 Jun 2007 10:45:16 +0000 (10:45 +0000)
committerRod Whitby <rod@whitby.id.au>
Sat, 2 Jun 2007 10:45:16 +0000 (10:45 +0000)
commitd195f2b1ad6079a2834a38bbd71ad47a8607fc12
tree24f6e92af4bc6fec46f291c76531d40fc20f10af
parente7b24d617c30b6c9bf6085066eefafc770e07ce1
parentf30635176494b63806086b2848f174457dcea7c2
Merge ... '47c01740d6df38376dfcb0407a0b42bb05e60a2b'
     and '8701b75312bc85935a3f37b136efa282813c426f'