merge of '9e0e042cf0a2ae14b02a20db24de2d6ac3ce71c3'
authorGraeme Gregory <dp@xora.org.uk>
Mon, 19 Nov 2007 15:44:45 +0000 (15:44 +0000)
committerGraeme Gregory <dp@xora.org.uk>
Mon, 19 Nov 2007 15:44:45 +0000 (15:44 +0000)
commit538e067ce8aae8035995ca85e611709db86c42c8
tree32dec79dc3cdce831159cc05a98dfa53b9c6ce08
parenteb558e274dca3ca0d7f0f1e2ad3e5ac834530454
parent04a35a9cbacf37eb512b9260df9b3059948b76aa
Merge ... '9e0e042cf0a2ae14b02a20db24de2d6ac3ce71c3'
     and 'afc80db8fab3b6a16e23409594197e4000e28086'