merge of '7bb175794c76c6b9b785835fe714b7e4e489206c'
authorMichael Lauer <mickey@vanille-media.de>
Fri, 14 Sep 2007 15:24:20 +0000 (15:24 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Fri, 14 Sep 2007 15:24:20 +0000 (15:24 +0000)
commit1fdd16a6b444667fccaca4e49692dc93d0ff9ea9
tree0d045c49e0d8c14c4affd08b75e7e8dbf6680790
parent25eb7666838876c213122135cd80630b20105463
parent4365dc125729b1ca744bf8f9f629fed01cf3b2c3
Merge ... '7bb175794c76c6b9b785835fe714b7e4e489206c'
     and 'e22359507956c45e7ed998bce3e90f6db8c81ecf'