merge of '47aec7f5811a7e41e48a85cc8ca83a9ef745e862'
authorGraeme Gregory <dp@xora.org.uk>
Tue, 4 Dec 2007 11:10:51 +0000 (11:10 +0000)
committerGraeme Gregory <dp@xora.org.uk>
Tue, 4 Dec 2007 11:10:51 +0000 (11:10 +0000)
commit680d0a26e2fc1dc87937c0e1138d49356f883bab
treee0ea67eeb3f7f55eb87434d4e95419d5776dd304
parent894335a1acd1fabdb37c25773ffdd0f795f570c4
parent0f865d735495b470dedd86a82edcac38ababf603
Merge ... '47aec7f5811a7e41e48a85cc8ca83a9ef745e862'
     and '5f67fa16e46b84f45483e590d1acf78095ca9c44'