merge of '296ff29bfd956e25378dc4b3d757bfe71b1010d5'
authorMichael Lauer <mickey@vanille-media.de>
Fri, 20 Oct 2006 11:55:16 +0000 (11:55 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Fri, 20 Oct 2006 11:55:16 +0000 (11:55 +0000)
commit0f03543eb2a001204993d7c22920feda3748fb31
tree849557f9525515c2a5673ef617fd088f4d9c49c4
parent21ccc08d57430f14dcfa9b85ffb52437c2361099
parenta81633e35bf595208cf9f6631b460eb17d56bab4
Merge ... '296ff29bfd956e25378dc4b3d757bfe71b1010d5'
     and '9a74dad27351d4893343978ef329c84a1fc7dbfb'