Merge commit 'upstream/2008.1+svn1641'
commitee02c87ac1d961a007fa203eeb04daa20aa42768
authorChristoph Egger <christoph@h738515.serverkompetenz.net>
Sat, 3 Jan 2009 16:19:34 +0000 (3 17:19 +0100)
committerChristoph Egger <christoph@h738515.serverkompetenz.net>
Sat, 3 Jan 2009 16:19:34 +0000 (3 17:19 +0100)
treeeec40cb22b4879bd59eed8f35301ebfce4094c28
parent81c9a9d5f6d27dc6ffeff8fa4a1653fd158bd3eb
parent56d69d6fcbf3e6d2da3cb77cb4078fbc942bba99
Merge commit 'upstream/2008.1+svn1641'