merge of '8c692ec4078a7d2e345213289da925bfca3cac63'
authorGraeme Gregory <dp@xora.org.uk>
Tue, 4 Dec 2007 11:24:38 +0000 (11:24 +0000)
committerGraeme Gregory <dp@xora.org.uk>
Tue, 4 Dec 2007 11:24:38 +0000 (11:24 +0000)
commitc2ec10e5520b850581a6979eb138be41bc6d277d
tree7249722f26f9543021ff2e98b86713c5e476cb1e
parentd9bec7fce7e68c7d277276185cea9bfb50e7af1c
parent680d0a26e2fc1dc87937c0e1138d49356f883bab
Merge ... '8c692ec4078a7d2e345213289da925bfca3cac63'
     and 'bee606bba2fcf2659a8e2c29fbbc9d904f84962c'