merge of 'af152d47ebbb835213adc897491fd19ccf8b4e1d'
authorMichael Lauer <mickey@vanille-media.de>
Sun, 17 Jun 2007 07:26:38 +0000 (07:26 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Sun, 17 Jun 2007 07:26:38 +0000 (07:26 +0000)
commit46409b6477e77bd8c059f9b76be6e0b569074a22
tree7713296ef0a9141c3e755fe6e208a432439aa177
parente28b4bdcb77609c03f711ab57abd735de67ec885
parenta4c6ad5b86ca8f4187498880ea3726e7013ea165
Merge ... 'af152d47ebbb835213adc897491fd19ccf8b4e1d'
     and 'b35bb3933a3e76175b51e40e2c83fdf1aafa3ed8'