Merge branch 'upstream'
authorBernd Zeimetz <bernd@bzed.de>
Sat, 21 Feb 2009 23:45:05 +0000 (00:45 +0100)
committerBernd Zeimetz <bernd@bzed.de>
Sat, 21 Feb 2009 23:45:05 +0000 (00:45 +0100)
commit276931fcadd41a33345051706db1150c833ca7b3
treea888480e058e06e0542c5da04407ebf19a8d9c1d
parent9c69aaa71963a5d2b55b60c26854cf1379fda1eb
parenta6be8f4ab7ef6a23d72157b0a6b2c840d23e2f92
Merge branch 'upstream'