merge from upstream
authorMark Hymers <mark@hymers.org.uk>
Wed, 26 Dec 2007 22:47:26 +0000 (22:47 +0000)
committerMark Hymers <mark@hymers.org.uk>
Wed, 26 Dec 2007 22:47:26 +0000 (22:47 +0000)
commit6bd0655ce94ed67ace68aa9b27ecaea2186a1d11
treecfe097edee46e10f5dac7ef38718bb781d5de054
parent4fe1c00d4fc54d666437ef45eaaf09208a57efe5
parentdc2644ca6761003bc2ede1d8c92235096b11c6fb
merge from upstream