merge of 'bf13c465f9f4c46132e74d7e9b93c2d1feb84ac6'
authorMichael Lauer <mickey@vanille-media.de>
Wed, 5 Dec 2007 00:13:30 +0000 (00:13 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Wed, 5 Dec 2007 00:13:30 +0000 (00:13 +0000)
commite6b68ae095a61a271a1191e4fc0945042bc4a754
tree553ea71392dee2a7dc1572407bb8338dda7e716a
parentdc54a3030e02d338c5ba84e68aaf604a0bcda65f
parent8eacfa2b31696d75d60e51e909d64da0999fbf8f
Merge ... 'bf13c465f9f4c46132e74d7e9b93c2d1feb84ac6'
     and 'c44db3b9dd388ba7d6071532d6536625c571b3bd'