merge of '981cc5dae86118a7c743b3f8ad711e7763194aae'
authorMichael Lauer <mickey@vanille-media.de>
Wed, 30 Jul 2008 18:29:33 +0000 (18:29 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Wed, 30 Jul 2008 18:29:33 +0000 (18:29 +0000)
commit8aa18f979e3ae6014e8303fcd2196e22e8f713df
tree5313e427dceb50f5c71eb2f34fcc3bd69efd8b3a
parenta7303ff4b1bc28ea51e06fc952125929e0295e80
parent176405c701cffad521df8c00845450f253281732
Merge ... '981cc5dae86118a7c743b3f8ad711e7763194aae'
     and 'e991ee5c3b5bbf092467b905481b36d1fde8d2de'