merge of 'd9a7dd0081361f783c4c47de77596d085c151416'
authorMichael Lauer <mickey@vanille-media.de>
Thu, 14 Jun 2007 07:19:53 +0000 (07:19 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Thu, 14 Jun 2007 07:19:53 +0000 (07:19 +0000)
commitd0a22057caf834e1960b6a0abf8a807b6d82bac0
tree433ef64baf6e705ad990660c070b5bd1fe59183c
parent6dfd134e423f7a33fdf1e48069890fb8fc4a41db
parentfd7ba11d6666ef8820b47ce518f00a37704d5398
Merge ... 'd9a7dd0081361f783c4c47de77596d085c151416'
     and 'e4ceeb027359e3758975231e04d3ebb40a674053'