Merge branch 'upstream'
authorBernd Zeimetz <bernd@bzed.de>
Sat, 23 Aug 2008 12:55:19 +0000 (14:55 +0200)
committerBernd Zeimetz <bernd@bzed.de>
Sat, 23 Aug 2008 12:55:19 +0000 (14:55 +0200)
commit95435cbccdc95ed0c623959336d33b12cd77f6dc
treeab1eedbe98f31e1ad90c30d8e324f4b5fc068fab
parent31bdb646d29c06ea7d981c5ab516d63865149b3f
parent507225001cebfe26045bb413ec2152990b9720cc
Merge branch 'upstream'