merge of '1ba4060144f3549b5ec4424715ddde5fd9d0ad61'
authorMichael Lauer <mickey@vanille-media.de>
Sun, 1 Jun 2008 12:23:21 +0000 (12:23 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Sun, 1 Jun 2008 12:23:21 +0000 (12:23 +0000)
commitd69fd172c6e48679d54aa3e6767fb0cd357fc416
tree88e74daad4385eb303a38b2c422ca5bd2d8ee208
parentb3b724b8114f74dabea8d6f6f8c31339841cef32
parenteffad2723e7a4e7f306e3090ec8e4791020f554c
Merge ... '1ba4060144f3549b5ec4424715ddde5fd9d0ad61'
     and 'a66740dc82701e8bcaf09d803b69b8601b7efb2d'