merge of '05b9706d2b72277e2f1da19e3714cc4a3c8fe9ee'
authorGraeme Gregory <dp@xora.org.uk>
Mon, 14 May 2007 11:20:11 +0000 (11:20 +0000)
committerGraeme Gregory <dp@xora.org.uk>
Mon, 14 May 2007 11:20:11 +0000 (11:20 +0000)
commit45de1cf1e067ad5b61e7da0c8bd17adce13298ae
treeca2e4306d46aa83d111dd3bd90521db079f4953a
parent2fa3f226a7ae8d4f034bf99f0a3e65496859129c
parent311a95e57ab420b5c5b37e5603a5350f8891ebf6
Merge ... '05b9706d2b72277e2f1da19e3714cc4a3c8fe9ee'
     and '2a1de6d722e47e2709e4ae5bb56c646315e2ed63'